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

[Lutingenerator-commits] r361 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org 07 Nov '08

07 Nov '08

Author: chatellier Date: 2008-11-07 10:27:19 +0000 (Fri, 07 Nov 2008) New Revision: 361 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java Log: Change defaut srcDirUml parameter name (common for zuml and zargo) Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java 2008-11-01 22:13:09 UTC (rev 360) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/Zargo2Xmi.java 2008-11-07 10:27:19 UTC (rev 361) @@ -48,13 +48,14 @@ * @goal zargo2xmi */ public class Zargo2Xmi extends AbstractMojo { + /** * Répertoire source des fichier Zargo * - * @parameter + * @parameter alias="srcDirZuml" * @required */ - protected File srcDirZuml; + protected File srcDirUml; /** * Répertoire cible des fichiers extraits @@ -93,7 +94,7 @@ /* Source */ FileSet fileSet = new FileSet(); fileSet.setProject(project); // resolve NullPointerException - fileSet.setDir(srcDirZuml); + fileSet.setDir(srcDirUml); fileSet.setIncludes("**/*.zargo,**/*.zuml"); zip.addFileset(fileSet); @@ -123,7 +124,7 @@ copy.setOverwrite(overwrite); FileSet fileSet = new FileSet(); - fileSet.setDir(srcDirZuml); + fileSet.setDir(srcDirUml); fileSet.setExcludes("**/*.zargo,**/*.zuml"); copy.addFileset(fileSet);

1 0

[Lutingenerator-commits] r360 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by tchemit＠users.labs.libre-entreprise.org 01 Nov '08

01 Nov '08

Author: tchemit Date: 2008-11-01 22:13:09 +0000 (Sat, 01 Nov 2008) New Revision: 360 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: if no excludeTemplates, use an empty list Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-01 19:51:42 UTC (rev 359) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-01 22:13:09 UTC (rev 360) @@ -148,7 +148,7 @@ generator.setProperties("defaultPackage=" + defaultPackage); generator.setIncludes(includes); - generator.setExcludeTemplates(excludeTemplates); + generator.setExcludeTemplates(excludeTemplates==null?java.util.Collections.<String>emptyList():excludeTemplates); /* Execution */ generator.execute();

1 0

[Lutingenerator-commits] r359 - lutingenerator/trunk lutingenerator/trunk/src/main/java/org/codelutin/generator maven-generator-plugin/trunk maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by tchemit＠users.labs.libre-entreprise.org 01 Nov '08

01 Nov '08

Author: tchemit Date: 2008-11-01 19:51:42 +0000 (Sat, 01 Nov 2008) New Revision: 359 Modified: lutingenerator/trunk/changelog lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java maven-generator-plugin/trunk/changelog maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: fix javadoc add excludeTempates property on Generator, GeneratorTaks and GeneratorPlugin to excludes some generators on composite generators Modified: lutingenerator/trunk/changelog =================================================================== --- lutingenerator/trunk/changelog 2008-11-01 18:58:52 UTC (rev 358) +++ lutingenerator/trunk/changelog 2008-11-01 19:51:42 UTC (rev 359) @@ -1,6 +1,7 @@ 0.61 chemit 200811?? * 20081101 [chemit] - - add a prent setter on ChildGenerator + - add a parent setter on ChildGenerator + - add an excludeTemplates property on Generator and GeneratorTask to permit exclusion of generators for some composite generator 0.60 chemit 20081013 * 20081013 [chemit] Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2008-11-01 18:58:52 UTC (rev 358) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/Generator.java 2008-11-01 19:51:42 UTC (rev 359) @@ -26,6 +26,7 @@ import java.io.File; import java.util.Properties; +import java.util.List; import java.io.Writer; import java.io.IOException; import java.io.FileWriter; @@ -48,6 +49,8 @@ /** date de derniere modification de la source la plus recente */ protected long lastModifiedSource = 0; + protected List<String> excludeTemplates; + public Generator(){ } @@ -73,17 +76,19 @@ } /** - * Permet de recuperer les proprietes passé en argument - */ + * Permet de recuperer la proprieté passé en argument + * @param name le nom de la propriete + * @return la valeur de la propriété + */ public String getProperty(String name){ return properties.getProperty(name); } protected void setLastModifiedSource(File [] files){ - for (int i = 0; i < files.length; i++) { - if(isNewerThanSource(files[i])){ - lastModifiedSource = files[i].lastModified(); - log.debug("source date: "+lastModifiedSource+" files[i] date: "+files[i].lastModified()+ "("+files[i]+")"); + for (File file : files) { + if (isNewerThanSource(file)) { + lastModifiedSource = file.lastModified(); + log.debug("source date: " + lastModifiedSource + " files[i] date: " + file.lastModified() + "(" + file + ")"); } } } @@ -93,7 +98,8 @@ } /** - * @return vrai si le fichier passé en parametre est plus recent que + * @param file fichier a tester + * @return vrai si le fichier passé en parametre est plus recent que * les sources sur generateur. */ protected boolean isNewerThanSource(File file){ @@ -121,6 +127,14 @@ } } + public List<String> getExcludeTemplates() { + return excludeTemplates; + } + + public void setExcludeTemplates(List<String> excludeTemplates) { + this.excludeTemplates = excludeTemplates; + } + public abstract void generate(File[] file, File destDir); } Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-11-01 18:58:52 UTC (rev 358) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-11-01 19:51:42 UTC (rev 359) @@ -32,6 +32,9 @@ import java.io.File; import java.util.Properties; +import java.util.List; +import java.util.Arrays; +import java.util.Iterator; import java.util.logging.Level; import java.util.logging.Logger; @@ -69,8 +72,10 @@ protected String templates = null; - protected File srcDir = null; + protected List<String> excludeTemplates; + protected File srcDir = null; + protected File srcFile = null; protected File destDir = null; @@ -87,7 +92,11 @@ this.templates = templates; } - /** + public void setExcludeTemplates(List<String> excludeTemplates) { + this.excludeTemplates = excludeTemplates; + } + + /** * Permet d'ajouter des properties. exemple: toto=1,package=org.codelutin * @param properties TODO */ @@ -119,27 +128,36 @@ throw new BuildException("templates attribute must be set!", getLocation()); } - String[] templateGenerators = templates.split(","); - generators = new Generator[templateGenerators.length]; - for (int i = 0; i < templateGenerators.length; i++) { - try { - generators[i] = (Generator) Class - .forName(templateGenerators[i]).newInstance(); - } catch (ClassCastException eee) { + List<String> templateGenerators = Arrays.asList(templates.split(",")); + for (Iterator<String> it = templateGenerators.iterator(); it.hasNext();) { + String templateGenerator = it.next(); + if (excludeTemplates.contains(templateGenerator)) { + it.remove(); + } + } + generators = new Generator[templateGenerators.size()]; + for (int i = 0; i < templateGenerators.size(); i++) { + String templateName = templateGenerators.get(i); + try { + generators[i] = (Generator) Class + .forName(templateName).newInstance(); + generators[i].setExcludeTemplates(excludeTemplates); + + } catch (ClassCastException eee) { System.out.println("Generator don't herite Generator Class : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } catch (ClassNotFoundException eee) { System.out.println("Unable to find generator : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } catch (InstantiationException eee) { System.out.println("Unable to instanciate template : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } catch (IllegalAccessException eee) { System.out.println("Unable to parse topia input file : " - + templateGenerators[i]); + + templateName); eee.printStackTrace(); } } Modified: maven-generator-plugin/trunk/changelog =================================================================== --- maven-generator-plugin/trunk/changelog 2008-11-01 18:58:52 UTC (rev 358) +++ maven-generator-plugin/trunk/changelog 2008-11-01 19:51:42 UTC (rev 359) @@ -1,5 +1,6 @@ 0.61 chemit 200811?? * 20081101 [chemit] + - add an excludeTemplates property on GeneratorPlugin to permit exclusion of generators for some composite generator - bump lutingenerator to 0.61 0.60 chemit 20081013 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-01 18:58:52 UTC (rev 358) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-01 19:51:42 UTC (rev 359) @@ -29,11 +29,11 @@ package org.codelutin.generator.plugin; +import org.apache.maven.model.Resource; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; -import org.apache.maven.model.Resource; import org.apache.tools.ant.BuildLogger; import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; @@ -41,6 +41,7 @@ import java.io.File; import java.util.Arrays; +import java.util.List; /** * Effectue toutes les générations et copie les fichiers générés @@ -82,6 +83,14 @@ protected String templates; /** + * Templates à ne pas utiliser + * + * @parameter + */ + protected List<String> excludeTemplates; + + + /** * Fichier à inclure * * @parameter @@ -135,10 +144,11 @@ generator.setDestdir(destDirGen); fixCompileSourceRoots(); - + generator.setProperties("defaultPackage=" + defaultPackage); generator.setIncludes(includes); + generator.setExcludeTemplates(excludeTemplates); /* Execution */ generator.execute(); @@ -150,12 +160,12 @@ */ protected void fixCompileSourceRoots() { if (!project.getCompileSourceRoots().contains(destDirGen.getPath())) { - getLog().info("add compile source root : "+destDirGen); + getLog().info("add compile source root : " + destDirGen); project.addCompileSourceRoot(destDirGen.getPath()); - Resource resources =new Resource(); + Resource resources = new Resource(); resources.setDirectory(destDirGen.getAbsolutePath()); resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("add resource root :"+resources); + getLog().info("add resource root :" + resources); project.addResource(resources); }

1 0

[Lutingenerator-commits] r358 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by tchemit＠users.labs.libre-entreprise.org 01 Nov '08

01 Nov '08

Author: tchemit Date: 2008-11-01 18:58:52 +0000 (Sat, 01 Nov 2008) New Revision: 358 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java Log: fix javadoc Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java 2008-11-01 18:51:02 UTC (rev 357) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java 2008-11-01 18:58:52 UTC (rev 358) @@ -168,8 +168,8 @@ } /** - * Par défaut, appel {@link generateFromModel(Writer,StateModel)} pour le - * model et {@link generateFromState(Writer,StateModelState)} pour tous les + * Par défaut, appel {@link #generateFromModel(MonitorWriter, org.codelutin.generator.models.state.StateModel)} pour le + * model et {@link #generateFromState(Writer,StateModelState)} pour tous les * etats du modele. * * @param stateModel @@ -256,8 +256,6 @@ /** * Return filename from state * - * @param chart - * the chart * @param state * the state * @return the filename @@ -272,8 +270,6 @@ * * @param monitorOut * the output writer - * @param chart - * the chart * @param state * the state */

1 0

[Lutingenerator-commits] r357 - lutingenerator/trunk maven-generator-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 01 Nov '08

01 Nov '08

Author: tchemit Date: 2008-11-01 18:51:02 +0000 (Sat, 01 Nov 2008) New Revision: 357 Modified: lutingenerator/trunk/changelog maven-generator-plugin/trunk/changelog Log: changelog Modified: lutingenerator/trunk/changelog =================================================================== --- lutingenerator/trunk/changelog 2008-11-01 18:49:19 UTC (rev 356) +++ lutingenerator/trunk/changelog 2008-11-01 18:51:02 UTC (rev 357) @@ -1,3 +1,7 @@ +0.61 chemit 200811?? + * 20081101 [chemit] + - add a prent setter on ChildGenerator + 0.60 chemit 20081013 * 20081013 [chemit] - make tests works again Modified: maven-generator-plugin/trunk/changelog =================================================================== --- maven-generator-plugin/trunk/changelog 2008-11-01 18:49:19 UTC (rev 356) +++ maven-generator-plugin/trunk/changelog 2008-11-01 18:51:02 UTC (rev 357) @@ -1,3 +1,7 @@ +0.61 chemit 200811?? + * 20081101 [chemit] + - bump lutingenerator to 0.61 + 0.60 chemit 20081013 * 20081013 [chemit] - remove addCompileDirectory option (always done) + add dynamic resources

1 0

[Lutingenerator-commits] r356 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by tchemit＠users.labs.libre-entreprise.org 01 Nov '08

01 Nov '08

Author: tchemit Date: 2008-11-01 18:49:19 +0000 (Sat, 01 Nov 2008) New Revision: 356 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/ChildGenerator.java Log: add a sette on parent in Generator Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/ChildGenerator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/ChildGenerator.java 2008-11-01 18:48:47 UTC (rev 355) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/ChildGenerator.java 2008-11-01 18:49:19 UTC (rev 356) @@ -41,6 +41,7 @@ this.parent = parent; } + @Override public String getProperty(String name){ if(parent == null){ return super.getProperty(name); @@ -49,6 +50,7 @@ } } + @Override public boolean getOverwrite(){ if(parent == null){ return super.getOverwrite(); @@ -57,6 +59,7 @@ } } + @Override protected long getLastModifiedSource(){ if(parent == null){ return super.getLastModifiedSource(); @@ -65,5 +68,9 @@ } } + public void setParent(Generator parent) { + this.parent = parent; + } + } // ChildGenerator

1 0

[Lutingenerator-commits] r355 - maven-generator-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 01 Nov '08

01 Nov '08

Author: tchemit Date: 2008-11-01 18:48:47 +0000 (Sat, 01 Nov 2008) New Revision: 355 Modified: maven-generator-plugin/trunk/pom.xml Log: bump lutingenerator to 0.61-SNAPSHOT Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-10-23 13:41:33 UTC (rev 354) +++ maven-generator-plugin/trunk/pom.xml 2008-11-01 18:48:47 UTC (rev 355) @@ -20,7 +20,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> - <version>0.60</version> + <version>0.61-SNAPSHOT</version> <scope>compile</scope> </dependency>

1 0

[Lutingenerator-commits] r354 - lutingenerator/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Oct '08

23 Oct '08

Author: chatellier Date: 2008-10-23 13:41:33 +0000 (Thu, 23 Oct 2008) New Revision: 354 Modified: lutingenerator/trunk/pom.xml Log: Update lib Modified: lutingenerator/trunk/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2008-10-23 13:08:40 UTC (rev 353) +++ lutingenerator/trunk/pom.xml 2008-10-23 13:41:33 UTC (rev 354) @@ -41,7 +41,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.30</version> + <version>0.31</version> <scope>compile</scope> </dependency>

1 0

[Lutingenerator-commits] r353 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by chatellier＠users.labs.libre-entreprise.org 23 Oct '08

23 Oct '08

Author: chatellier Date: 2008-10-23 13:08:40 +0000 (Thu, 23 Oct 2008) New Revision: 353 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java Log: Usunsed import Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java 2008-10-13 15:50:11 UTC (rev 352) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/StateModelGenerator.java 2008-10-23 13:08:40 UTC (rev 353) @@ -22,23 +22,11 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import java.util.ArrayList; import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Matcher; import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelElement; -import org.codelutin.generator.models.object.xml.ObjectModelClassifierImpl; -import org.codelutin.generator.models.object.xml.ObjectModelElementImpl; -import org.codelutin.generator.models.object.xml.ObjectModelImpl; -import org.codelutin.generator.models.object.xml.ObjectModelImplRef; -import org.codelutin.generator.models.object.xml.ObjectModelImplTagValue; import org.codelutin.generator.models.state.StateModel; import org.codelutin.generator.models.state.StateModelState; import org.codelutin.generator.models.state.StateModelStateChart; @@ -46,7 +34,6 @@ import org.codelutin.generator.models.state.xml.StateModelImpl; import org.codelutin.util.FileUtil; import org.codelutin.util.RecursiveProperties; -import org.codelutin.util.StringUtil; import org.xml.sax.SAXException; /**

1 0

[Lutingenerator-commits] r352 - maven-generator-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 13 Oct '08

13 Oct '08

Author: tchemit Date: 2008-10-13 15:50:11 +0000 (Mon, 13 Oct 2008) New Revision: 352 Modified: maven-generator-plugin/trunk/pom.xml Log: push back scm generic values after release Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-10-13 15:44:43 UTC (rev 351) +++ maven-generator-plugin/trunk/pom.xml 2008-10-13 15:50:11 UTC (rev 352) @@ -81,10 +81,10 @@   - <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-generator…</url> + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> - + </project>

1 0