- Eugene-commits - mailman.cloud.codelutin.com

r895 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:54:58 +0200 (Sat, 08 May 2010) New Revision: 895 Url: http://nuiton.org/repositories/revision/eugene/895 Log: add headers Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java 2010-05-08 16:52:40 UTC (rev 894) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManager.java 2010-05-08 16:54:58 UTC (rev 895) @@ -1,23 +1,23 @@ /* * #%L * EUGene :: EUGene - * + * * $Id$ * $HeadURL$ * %% * Copyright (C) 2004 - 2010 CodeLutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java 2010-05-08 16:52:40 UTC (rev 894) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/CodesManagerExtension.java 2010-05-08 16:54:58 UTC (rev 895) @@ -1,3 +1,27 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.eugene.java; import org.apache.commons.logging.Log;

1 0

r894 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:52:40 +0200 (Sat, 08 May 2010) New Revision: 894 Url: http://nuiton.org/repositories/revision/eugene/894 Log: add log Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-05-08 16:52:09 UTC (rev 893) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-05-08 16:52:40 UTC (rev 894) @@ -54,6 +54,10 @@ @Override public void transformFromClass(ObjectModelClass clazz) { if (!canGenerate(clazz)) { + + if (log.isDebugEnabled()) { + log.debug("Skip generation for "+clazz.getQualifiedName()); + } return; } @@ -63,7 +67,7 @@ if (log.isDebugEnabled()) { log.debug("will generate "+ resultClass.getQualifiedName()); } - + ObjectModelClass resultClassImpl = generateImpl(clazz, resultClass); if (log.isDebugEnabled()) { @@ -75,7 +79,7 @@ resultClass.getQualifiedName()); } } - + addSuperClass(clazz, resultClass, resultClassImpl); addInterfaces(clazz, resultClass); @@ -102,7 +106,7 @@ createPropertyChangeSupport(resultClass); boolean hasAMultipleProperty = containsMutiple(properties); - + // Add helper operations if (hasAMultipleProperty) { createGetChildMethod(resultClass);

1 0

r893 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:52:09 +0200 (Sat, 08 May 2010) New Revision: 893 Url: http://nuiton.org/repositories/revision/eugene/893 Log: improve code Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-05-08 16:51:38 UTC (rev 892) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java 2010-05-08 16:52:09 UTC (rev 893) @@ -152,8 +152,9 @@ * @param destDir dossier de destination pour le fichier généré * @param type type explicite d'ObjectModel */ - private void generateFromElements(Collection<? extends ObjectModelElement> elements, File destDir, - ObjectModelType type) { + private void generateFromElements(Collection<? extends ObjectModelElement> elements, + File destDir, + ObjectModelType type) { for (ObjectModelElement element : elements) { String filename = ""; @@ -189,8 +190,10 @@ * @param filename nom du fichier de sortie * @param type type d'ObjectModel */ - protected void generateFromElement(Object element, File destDir, String filename, - ObjectModelType type) { + protected void generateFromElement(Object element, + File destDir, + String filename, + ObjectModelType type) { // on a maintenant une restriction des elements a generer // c'est à dire un filtrage par package @@ -211,27 +214,33 @@ } try { StringWriter out = new StringWriter(); + MonitorWriter monitorOut = new MonitorWriter(out); + try { + switch (type) { + case OBJECT_MODEL: + generateFromModel(monitorOut, (ObjectModel) element); + break; + case OBJECT_MODEL_CLASSIFIER: + generateFromClassifier(monitorOut, (ObjectModelClassifier) element); + break; + case OBJECT_MODEL_INTERFACE: + generateFromInterface(monitorOut, (ObjectModelInterface) element); + break; + case OBJECT_MODEL_CLASS: + generateFromClass(monitorOut, (ObjectModelClass) element); + break; + case OBJECT_MODEL_ENUMERATION: + generateFromEnumeration(monitorOut, (ObjectModelEnumeration) element); + break; + } - switch (type) { - case OBJECT_MODEL: - generateFromModel(monitorOut,(ObjectModel)element); - break; - case OBJECT_MODEL_CLASSIFIER: - generateFromClassifier(monitorOut, (ObjectModelClassifier)element); - break; - case OBJECT_MODEL_INTERFACE: - generateFromInterface(monitorOut, (ObjectModelInterface)element); - break; - case OBJECT_MODEL_CLASS: - generateFromClass(monitorOut, (ObjectModelClass)element); - break; - case OBJECT_MODEL_ENUMERATION: - generateFromEnumeration(monitorOut, (ObjectModelEnumeration)element); - break; + write(outputFile, monitorOut); + + } finally { + monitorOut.close(); } - write(outputFile, monitorOut); } catch (Exception eee) { log.warn("Erreur lors de la génération du fichier " + outputFile); @@ -245,8 +254,9 @@ /** * Test if given element can be generated. * - * An element can be generated if his package is in the {@link #generatedPackages} list - * or if {@link #generatedPackages} is null or empty. + * An element can be generated if his package is in the + * {@link #generatedPackages} list or if {@link #generatedPackages} is + * null or empty. * * @param element element to test * @return generation allowed @@ -285,7 +295,8 @@ * @param packageName le nom du paquetage * @return le repertoire correspondant au paquetage */ - public String getFilenameForPackage(ObjectModel model, String packageName) { + public String getFilenameForPackage(ObjectModel model, + String packageName) { return packageName.replace('.', File.separatorChar); } @@ -326,21 +337,27 @@ // return enumeration.getQualifiedName().replace('.', File.separatorChar); } - public void generateFromModel(Writer output, ObjectModel model) throws IOException { + public void generateFromModel(Writer output, + ObjectModel model) throws IOException { } - public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { + public void generateFromInterface(Writer output, + ObjectModelInterface interfacez) throws IOException { } - public void generateFromEnum(Writer output, ObjectModelEnumeration interfacez) throws IOException { + public void generateFromEnum(Writer output, + ObjectModelEnumeration interfacez) throws IOException { } - public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException { + public void generateFromClass(Writer output, + ObjectModelClass clazz) throws IOException { } - public void generateFromClassifier(Writer output, ObjectModelClassifier clazz) throws IOException { + public void generateFromClassifier(Writer output, + ObjectModelClassifier clazz) throws IOException { } - public void generateFromEnumeration(Writer output, ObjectModelEnumeration enumeration) throws IOException { + public void generateFromEnumeration(Writer output, + ObjectModelEnumeration enumeration) throws IOException { } }

1 0

r892 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:51:38 +0200 (Sat, 08 May 2010) New Revision: 892 Url: http://nuiton.org/repositories/revision/eugene/892 Log: improve code Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2010-05-08 16:51:07 UTC (rev 891) +++ trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java 2010-05-08 16:51:38 UTC (rev 892) @@ -25,25 +25,23 @@ package org.nuiton.eugene; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.models.Model; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; -import org.nuiton.eugene.models.Model; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * AbstractGenerator - * + * <p/> * Created: 28 oct. 2009 * + * @author fdesbois <fdesbois(a)codelutin.com> * @param <M> type of Model - * - * @author fdesbois <fdesbois(a)codelutin.com> */ public abstract class AbstractGenerator<M extends Model> extends Template<M> { @@ -109,7 +107,7 @@ protected boolean isNewerThanSource(File file) { if (log.isDebugEnabled()) { log.debug("source date: " + getLastModifiedSource() - + " file date: " + file.lastModified() + "(" + file + ")"); + + " file date: " + file.lastModified() + " (" + file + ")"); } return file.lastModified() > getLastModifiedSource(); } @@ -120,7 +118,7 @@ /** * Test if given package is allowed for generation. - * + * <p/> * An element can be generated if his package is in the * {@link #generatedPackages} list or if {@link #generatedPackages} is null * or empty. @@ -166,43 +164,57 @@ } protected void write(File outputFile, MonitorWriter out) { - File write0utputFile = outputFile; - if (out.isModified()) { - try { - write0utputFile = outputFile.getCanonicalFile(); - if (!write0utputFile.getParentFile().exists()) { - boolean b = write0utputFile.getParentFile().mkdirs(); - if (!b) { - throw new IllegalStateException( - "could not create directory " + - write0utputFile.getParentFile()); - } + if (!out.isModified()) { + if (log.isDebugEnabled()) { + log.debug("skip generation of " + outputFile + ", No content."); + } + return; + } + try { + outputFile = outputFile.getCanonicalFile(); + + if (!outputFile.getParentFile().exists()) { + boolean b = outputFile.getParentFile().mkdirs(); + if (!b) { + throw new IllegalStateException( + "could not create directory " + + outputFile.getParentFile()); } + } - Writer output; - - String encoding = getEncoding(); - FileOutputStream stream = new FileOutputStream(write0utputFile); - if (encoding != null) { - if (log.isDebugEnabled()) { - log.debug("Force encoding to " + encoding + " : " + this); - } - output = new OutputStreamWriter(stream, encoding); - } else { - output = new OutputStreamWriter(stream); + Writer output = getWriter(outputFile); + try { + if (log.isDebugEnabled()) { + log.debug("Will generate file " + outputFile); } - try { - output.write(out.getBuffer().toString()); - } finally { - output.close(); - } - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("Unable to write file : " + write0utputFile.getAbsolutePath(), eee); - } - throw new RuntimeException(eee); + output.write(out.getBuffer().toString()); + } finally { + output.close(); } + } catch (IOException eee) { + if (log.isWarnEnabled()) { + log.warn("Unable to write file : " + + outputFile.getAbsolutePath(), eee); + } + throw new RuntimeException(eee); } } + + protected Writer getWriter(File outputFile) throws IOException { + + FileOutputStream stream = new FileOutputStream(outputFile); + Writer output; + String encoding = getEncoding(); + if (encoding != null) { + if (log.isDebugEnabled()) { + log.debug("Force encoding to " + encoding + " : " + this); + } + output = new OutputStreamWriter(stream, encoding); + } else { + output = new OutputStreamWriter(stream); + } + return output; + + } }

1 0

r891 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:51:07 +0200 (Sat, 08 May 2010) New Revision: 891 Url: http://nuiton.org/repositories/revision/eugene/891 Log: improve log Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-05-08 16:50:39 UTC (rev 890) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-05-08 16:51:07 UTC (rev 891) @@ -48,7 +48,7 @@ * Created: 22 oct. 2009 * * @author fdesbois - * @version $Revision$ + * @version $Id$ * * Stupid generation of an ObjectModel with Java classes and interfaces. * Use of ImportsManager to get imports for a classifier (added in model in the JavaBuilder which construct @@ -56,8 +56,7 @@ * * The JavaGenerator is based on a ObjectModelGenerator : Java classes are represented by ObjectModelClass, ... * - * Mise a jour: $Date$ - * par : * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaGenerator" + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaGenerator" */ public class JavaGenerator extends ObjectModelGenerator { @@ -104,7 +103,7 @@ throws IOException { if (log.isDebugEnabled()) { - log.debug(clazz.getQualifiedName()); + log.debug("Will generate class "+clazz.getQualifiedName()); } preparePrefix(clazz);

1 0

r890 - trunk/maven-eugene-plugin
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:50:39 +0200 (Sat, 08 May 2010) New Revision: 890 Url: http://nuiton.org/repositories/revision/eugene/890 Log: make its works with maven 3 Modified: trunk/maven-eugene-plugin/pom.xml Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-05-08 16:50:20 UTC (rev 889) +++ trunk/maven-eugene-plugin/pom.xml 2010-05-08 16:50:39 UTC (rev 890) @@ -153,6 +153,7 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> </plugin> <plugin>

1 0

r889 - in trunk/maven-eugene-plugin/src/it: . copyVersionFiles/anomalie163 smart-generate/all smart-generate/all/src smart-generate/all/src/main smart-generate/generators
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:50:20 +0200 (Sat, 08 May 2010) New Revision: 889 Url: http://nuiton.org/repositories/revision/eugene/889 Log: make its works with maven 3 Added: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/ Removed: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/java/ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/test/ Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml trunk/maven-eugene-plugin/src/it/settings.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -138,7 +138,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.3.0-beta-7</version> + <version>2.3</version> <scope>compile</scope> </dependency> <dependency> Modified: trunk/maven-eugene-plugin/src/it/settings.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/settings.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/settings.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -64,6 +64,18 @@ <enabled>true</enabled> </snapshots> </pluginRepository> + + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> </pluginRepositories> </profile> </profiles> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -50,40 +50,24 @@ <build> <plugins> - - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>${project.version}</version> <configuration> - <testPhase>true</testPhase> + <verbose>true</verbose> +  <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <fullPackagePath>org.nuiton</fullPackagePath> - <templates>org.nuiton.eugene.test.BeanTransformer</templates> + <templates>org.nuiton.eugene.java.JavaBeanTransformer</templates> </configuration> <executions> <execution> <id>Zargo to java</id> <phase>generate-test-sources</phase> <configuration> - <inputs>zargo:src/test/zargo:*.zargo</inputs> + <inputs>zargo:src/main/zargo:*.zargo</inputs> <outputDirectory>target/generated-sources-zargo2Java</outputDirectory> </configuration> <goals> @@ -105,7 +89,7 @@ <id>Model to java</id> <phase>generate-test-sources</phase> <configuration> - <inputs>model:target/generated-sources-zargo2Java/test-models:topiatest.objectmodel</inputs> + <inputs>model:target/generated-sources-zargo2Java/models:topiatest.objectmodel</inputs> <outputDirectory>target/generated-sources-objectModel2Java</outputDirectory> </configuration> <goals> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-05-08 16:50:20 UTC (rev 889) @@ -2,46 +2,47 @@ // Zargo to java assert new File(basedir, 'target/generated-sources-zargo2Java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi/topiatest.xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi/topiatest.xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Siege.java').exists(); // Xmi to java + assert new File(basedir, 'target/generated-sources-xmi2Java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Siege.java').exists(); // ObjectModel to java assert new File(basedir, 'target/generated-sources-objectModel2Java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Siege.java').exists(); return true; Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -1,147 +1,152 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>@pom.version@</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>@pom.version@</version> + </parent> - <groupId>org.nuiton.test</groupId> - <artifactId>eugene-test-modelreader</artifactId> + <groupId>org.nuiton.test</groupId> + <artifactId>eugene-test-modelreader</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> +  +  +  -  -  -  + <name>EUGene :: Test</name> + <description>Test module for generators.</description> + <inceptionYear>2007</inceptionYear> - <name>EUGene :: Test</name> - <description>Test module for generators.</description> - <inceptionYear>2007</inceptionYear> + <contributors> + <contributor> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <timezone>+2</timezone> + <roles> + <role>Developpeur</role> + </roles> + </contributor> + </contributors> - <contributors> - <contributor> - <name>Florian Desbois</name> - <email>fdesbois(a)codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - </contributors> +  +  +  -  -  -  + <packaging>jar</packaging> - <packaging>jar</packaging> + <properties> + <processor.version>1.0.3</processor.version> + </properties> + <build> - <build> + <plugins> - <plugins> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <includes>**/*.java</includes> + <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter + </filters> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <testPhase>true</testPhase> + <defaultPackage>org.nuiton.eugene.test</defaultPackage> + <generatedPackages>org.nuiton</generatedPackages> + </configuration> + <executions> + <execution> + <id>Test Regression Generator</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model:src/test/models:dtotest.objectmodel</inputs> + <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + <execution> + <id>Test Bean Transformer</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model:src/test/models:dtotest2.objectmodel</inputs> + <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> +  + </executions> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </plugin> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <testPhase>true</testPhase> - <defaultPackage>org.nuiton.eugene.test</defaultPackage> - <generatedPackages>org.nuiton</generatedPackages> - </configuration> - <executions> - <execution> - <id>Test Regression Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model:src/test/models:dtotest.objectmodel</inputs> - <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - <execution> - <id>Test Bean Transformer</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model:src/test/models:dtotest2.objectmodel</inputs> - <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> -  - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> + </plugins> - </plugins> + </build> - </build> - </project>

1 0

r888 - trunk
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 18:49:10 +0200 (Sat, 08 May 2010) New Revision: 888 Url: http://nuiton.org/repositories/revision/eugene/888 Log: Evolution #584: Use maven-helper-plugin 1.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-08 11:54:12 UTC (rev 887) +++ trunk/pom.xml 2010-05-08 16:49:10 UTC (rev 888) @@ -271,6 +271,7 @@ <processor.version>1.0.3</processor.version> <nuiton-utils.version>1.2.2</nuiton-utils.version> + <helper.version>1.2.4-SNAPSHOT</helper.version>  <siteLocales>en,fr</siteLocales>

1 0

r887 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org May 8, 2010

May 8, 2010

Author: tchemit Date: 2010-05-08 13:54:12 +0200 (Sat, 08 May 2010) New Revision: 887 Url: http://nuiton.org/repositories/revision/eugene/887 Log: improve MonitorWriter Modified: trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java 2010-05-08 11:12:02 UTC (rev 886) +++ trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java 2010-05-08 11:54:12 UTC (rev 887) @@ -28,6 +28,7 @@ import java.io.FilterWriter; import java.io.IOException; import java.io.StringWriter; +import java.io.Writer; /** * Permet de savoir si on a ecrit dans le flux ou non. L'ecriture d'une chaine @@ -45,16 +46,13 @@ public class MonitorWriter extends FilterWriter { // MonitorWriter boolean modified; - //FIXME : ca sert a quoi duplique cette propriete qui existe dans FilterWriter ? - StringWriter out; public MonitorWriter(StringWriter out) { super(out); - this.out = out; } public StringBuffer getBuffer() { - return out.getBuffer(); + return ((StringWriter)out).getBuffer(); } public boolean isModified() { @@ -79,5 +77,37 @@ modified = true; } + @Override + public void write(String str) throws IOException { + super.write(str); + modified = true; + } + + @Override + public void write(char[] cbuf) throws IOException { + super.write(cbuf); + modified = true; + } + + @Override + public Writer append(CharSequence csq) throws IOException { + Writer writer = super.append(csq); + modified = true; + return writer; + } + + @Override + public Writer append(CharSequence csq, int start, int end) throws IOException { + Writer writer = super.append(csq, start, end); + modified = true; + return writer; + } + + @Override + public Writer append(char c) throws IOException { + Writer writer = super.append(c); + modified = true; + return writer; + } }// MonitorWriter

1 0

r886 - in trunk/eugene/src/main/java/org/nuiton/eugene: . models/object models/state
by fdesbois＠users.nuiton.org May 8, 2010

May 8, 2010

Author: fdesbois Date: 2010-05-08 13:12:02 +0200 (Sat, 08 May 2010) New Revision: 886 Url: http://nuiton.org/repositories/revision/eugene/886 Log: Correction of read method signature : "File[] files" becomes "File... files" Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -36,12 +36,10 @@ * * Created: 26 oct. 2009 * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ * @param <M> Model to create from reading input files - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + */ public abstract class ModelReader<M extends Model> { private static final Log log = LogFactory.getLog(ModelReader.class); @@ -49,7 +47,7 @@ /** date de derniere modification de la source la plus recente */ protected long lastModifiedSource = 0; - protected void setLastModifiedSource(File[] files) { + protected void setLastModifiedSource(File... files) { for (File file : files) { if (file.lastModified() > getLastModifiedSource()) { lastModifiedSource = file.lastModified(); @@ -67,10 +65,10 @@ //TODO-TC : il vaut mieux directement un type dit variable // example : public abstract M read(File... file) {} - public M read(File file) { - return read(new File[] { file }); - } +// public M read(File file) { +// return read(new File[] { file }); +// } - public abstract M read(File[] file); + public abstract M read(File... file); } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -58,11 +58,8 @@ * * Created: 26 oct. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="objectmodel" */ public class ObjectModelReader extends ModelReader<ObjectModel> { @@ -90,7 +87,7 @@ * stereotype ou des tag value sur les class, attribute ou operation */ @Override - public ObjectModel read(File[] files) { + public ObjectModel read(File... files) { setLastModifiedSource(files); ObjectModel objectModel = new ObjectModelImpl(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2010-05-08 08:14:32 UTC (rev 885) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2010-05-08 11:12:02 UTC (rev 886) @@ -44,11 +44,8 @@ * * Created: 26 oct. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="statemodel" */ public class StateModelReader extends ModelReader<StateModel> { @@ -56,7 +53,7 @@ private static final Log log = LogFactory.getLog(StateModelReader.class); @Override - public StateModel read(File[] files) { + public StateModel read(File... files) { Digester digester = new Digester(); digester.addRuleSet(new DigesterStateModelRuleSet());

1 0