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

[Lutingenerator-commits] r331 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 13:47:37 +0000 (Mon, 13 Oct 2008) New Revision: 331 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: remove addCompileDirectory parameter (always execute) add resources dir from the destGenDir without the java files 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-10-13 13:46:12 UTC (rev 330) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-10-13 13:47:37 UTC (rev 331) @@ -33,12 +33,14 @@ 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; import org.codelutin.generator.GeneratorTask; import java.io.File; +import java.util.Arrays; /** * Effectue toutes les générations et copie les fichiers générés @@ -95,17 +97,6 @@ protected String defaultPackage; /** - * Flag pour indiquer si on doit ajouter le repertoire de generation dans les répertoires - * de compilation du project Maven Nom par défaut du paquetage généré - * <p/> - * TODO Ce flag doit disparaitre dans la prochaine release (uniquement utilisée pour compatibilité) - * - * @parameter expression="${generator.addCompileDirectory}" default-value="false" - */ - protected boolean addCompileDirectory; - - - /** * Ecrase les fichiers générés * * @parameter default-value="false" @@ -143,10 +134,8 @@ destDirGen.mkdirs(); generator.setDestdir(destDirGen); - if (addCompileDirectory) { - fixCompileSourceRoots(); - } - + fixCompileSourceRoots(); + generator.setProperties("defaultPackage=" + defaultPackage); generator.setIncludes(includes); @@ -161,7 +150,14 @@ */ protected void fixCompileSourceRoots() { if (!project.getCompileSourceRoots().contains(destDirGen.getPath())) { + getLog().info("add compile source root : "+destDirGen); project.addCompileSourceRoot(destDirGen.getPath()); + Resource resources =new Resource(); + resources.setDirectory(destDirGen.getAbsolutePath()); + resources.setExcludes(Arrays.asList("**/*.java")); + getLog().info("add resource root :"+resources); + project.addResource(resources); } + } }

1 0

[Lutingenerator-commits] r330 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 13:46:12 +0000 (Mon, 13 Oct 2008) New Revision: 330 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/CopyVersionFiles.java Log: foreach + javadoc Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/CopyVersionFiles.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/CopyVersionFiles.java 2008-10-13 13:44:32 UTC (rev 329) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/CopyVersionFiles.java 2008-10-13 13:46:12 UTC (rev 330) @@ -156,7 +156,8 @@ /** * Check if previous saved files are already present - */ + * @return <code>true</code> if already present,<code>false</code> otherwise. + */ protected boolean checkExistence() { boolean exist = false; @@ -199,8 +200,8 @@ fileSet.setDir(destDirGen); fileSet.setIncludes(copyVersionFiles); copy.addFileset(fileSet); - - /* Execution */ + + /* Execution */ copy.execute(); } @@ -213,24 +214,24 @@ File[] modelFiles = srcModelDir.listFiles(this); - for (int i = 0; i < modelFiles.length; ++i) { - SAXReader saxR = new SAXReader(); - Document document; - try { - document = saxR.read(modelFiles[i]); - Node node; - node = document.selectSingleNode("/objectModel/@version"); - if (node != null) { - versionFound = node.getStringValue(); - } - node = document.selectSingleNode("/objectModel/@name"); - if (node != null) { - modelNameFound = node.getStringValue(); - } - } catch (DocumentException e) { - logger.error("Can't read document", e); - } - } + for (File modelFile : modelFiles) { + SAXReader saxR = new SAXReader(); + Document document; + try { + document = saxR.read(modelFile); + Node node; + node = document.selectSingleNode("/objectModel/@version"); + if (node != null) { + versionFound = node.getStringValue(); + } + node = document.selectSingleNode("/objectModel/@name"); + if (node != null) { + modelNameFound = node.getStringValue(); + } + } catch (DocumentException e) { + logger.error("Can't read document", e); + } + } } protected Project createProject() {

1 0

[Lutingenerator-commits] r329 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 13:44:32 +0000 (Mon, 13 Oct 2008) New Revision: 329 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java Log: foreach + little code improvment Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-10-02 15:40:56 UTC (rev 328) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2008-10-13 13:44:32 UTC (rev 329) @@ -57,14 +57,14 @@ protected void doExecute(File[] srcFiles, File destDir, Generator[] generators) throws BuildException { - for (int i = 0; i < generators.length; i++) { - log("Applying " + generators[i].getClass().getName() + " into " + destDir); - if (generators[i] != null) { - generators[i].setProperties(properties); - generators[i].setOverwrite(overwrite); - generators[i].generate(srcFiles, destDir); - } - } + for (Generator generator : generators) { + if (generator != null) { + log("Applying " + generator.getClass().getName() + " into " + destDir); + generator.setProperties(properties); + generator.setOverwrite(overwrite); + generator.generate(srcFiles, destDir); + } + } } protected String templates = null; @@ -89,13 +89,14 @@ /** * Permet d'ajouter des properties. exemple: toto=1,package=org.codelutin - */ + * @param properties TODO + */ public void setProperties(String properties) { String[] props = properties.split(","); - for (int i = 0; i < props.length; i++) { - String[] pv = props[i].split("="); - this.properties.put(pv[0], pv[1]); - } + for (String prop : props) { + String[] pv = prop.split("="); + this.properties.put(pv[0], pv[1]); + } Logger.getLogger(getClass().getName() + ".setProperties").log( Level.FINE, "Properties " + this.properties); } @@ -113,7 +114,7 @@ } public void execute() throws BuildException { - Generator[] generators = null; + Generator[] generators; if (templates == null) { throw new BuildException("templates attribute must be set!", getLocation());

1 0

[Lutingenerator-commits] r328 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 15:40:56 +0000 (Thu, 02 Oct 2008) New Revision: 328 Modified: maven-generator-plugin/trunk/pom.xml Log: Use snapshot version Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-10-02 15:40:32 UTC (rev 327) +++ maven-generator-plugin/trunk/pom.xml 2008-10-02 15:40:56 UTC (rev 328) @@ -82,7 +82,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> - <version>0.51</version> + <version>0.51-SNAPSHOT</version> <scope>compile</scope> </dependency>

1 0

[Lutingenerator-commits] r327 - lutingenerator/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 15:40:32 +0000 (Thu, 02 Oct 2008) New Revision: 327 Modified: lutingenerator/trunk/pom.xml Log: Use snapshot version Modified: lutingenerator/trunk/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2008-10-02 15:37:54 UTC (rev 326) +++ lutingenerator/trunk/pom.xml 2008-10-02 15:40:32 UTC (rev 327) @@ -21,7 +21,7 @@ <packaging>jar</packaging>  - <version>0.51</version> + <version>0.51-SNAPSHOT</version>  <description>

1 0

[Lutingenerator-commits] r326 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 15:37:54 +0000 (Thu, 02 Oct 2008) New Revision: 326 Modified: maven-generator-plugin/trunk/pom.xml Log: Back to snapshot Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-10-02 15:24:50 UTC (rev 325) +++ maven-generator-plugin/trunk/pom.xml 2008-10-02 15:37:54 UTC (rev 326) @@ -21,7 +21,7 @@ <packaging>maven-plugin</packaging>  - <version>0.51</version> + <version>0.51-SNAPSHOT</version>  <inceptionYear>2006</inceptionYear>

1 0

[Lutingenerator-commits] r325 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 15:24:50 +0000 (Thu, 02 Oct 2008) New Revision: 325 Modified: maven-generator-plugin/trunk/pom.xml Log: Change ant scope in compile Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-10-02 15:22:03 UTC (rev 324) +++ maven-generator-plugin/trunk/pom.xml 2008-10-02 15:24:50 UTC (rev 325) @@ -92,12 +92,12 @@ <version>0.2</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.7.1</version> - <scope>runtime</scope> + <scope>compile</scope> </dependency> <dependency>

1 0

[Lutingenerator-commits] r324 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 15:22:03 +0000 (Thu, 02 Oct 2008) New Revision: 324 Modified: maven-generator-plugin/trunk/pom.xml Log: Restore ant deps Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-09-30 07:55:06 UTC (rev 323) +++ maven-generator-plugin/trunk/pom.xml 2008-10-02 15:22:03 UTC (rev 324) @@ -92,7 +92,21 @@ <version>0.2</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.7.1</version> + <scope>runtime</scope> + </dependency> + </dependencies> </project>

1 0

[Lutingenerator-commits] r323 - in lutingenerator/trunk/src: . main
by chatellier＠users.labs.libre-entreprise.org Sept. 30, 2008

Sept. 30, 2008

Author: chatellier Date: 2008-09-30 07:55:06 +0000 (Tue, 30 Sep 2008) New Revision: 323 Added: lutingenerator/trunk/src/main/xsl/ Removed: lutingenerator/trunk/src/xsl/ Log: Move xsl dir to main for inclusion in jar Copied: lutingenerator/trunk/src/main/xsl (from rev 320, lutingenerator/trunk/src/xsl)

1 0

[Lutingenerator-commits] r322 - maven-generator-plugin/trunk
by thimel＠users.labs.libre-entreprise.org Sept. 25, 2008

Sept. 25, 2008

Author: thimel Date: 2008-09-25 09:31:41 +0000 (Thu, 25 Sep 2008) New Revision: 322 Modified: maven-generator-plugin/trunk/pom.xml Log: Added dependency to lutinpluginutil Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-09-25 09:29:16 UTC (rev 321) +++ maven-generator-plugin/trunk/pom.xml 2008-09-25 09:31:41 UTC (rev 322) @@ -86,6 +86,13 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> + </dependencies> </project>

1 0