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

[Lutingenerator-commits] r371 - in maven-generator-plugin/tags: . maven-generator-plugin-0.61 maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:28:19 +0000 (Fri, 14 Nov 2008) New Revision: 371 Added: maven-generator-plugin/tags/maven-generator-plugin-0.61/ maven-generator-plugin/tags/maven-generator-plugin-0.61/pom.xml maven-generator-plugin/tags/maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Removed: maven-generator-plugin/tags/maven-generator-plugin-0.61/pom.xml maven-generator-plugin/tags/maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: [maven-release-plugin] copy for tag maven-generator-plugin-0.61 Copied: maven-generator-plugin/tags/maven-generator-plugin-0.61 (from rev 363, maven-generator-plugin/trunk) Deleted: maven-generator-plugin/tags/maven-generator-plugin-0.61/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-11-07 16:56:41 UTC (rev 363) +++ maven-generator-plugin/tags/maven-generator-plugin-0.61/pom.xml 2008-11-14 09:28:19 UTC (rev 371) @@ -1,90 +0,0 @@ -<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginproject</artifactId> - <version>3.0</version> - </parent> - - <artifactId>maven-generator-plugin</artifactId> - -  - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - <version>0.61-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>0.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.7.1</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - -  -  -  - <name>Plugin maven Generator</name> - <version>0.61-SNAPSHOT</version> - <inceptionYear>2006</inceptionYear> - <description>maven plugin to use the lutingenerator library</description> - -  -  -  - <packaging>maven-plugin</packaging> - - <properties> -  - <labs.id>39</labs.id> - -  - <labs.project>lutingenerator</labs.project> - - </properties> - - <build> - <plugins> - - </plugins> - </build> - - -  -  -  - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: maven-generator-plugin/tags/maven-generator-plugin-0.61/pom.xml (from rev 370, maven-generator-plugin/trunk/pom.xml) =================================================================== --- maven-generator-plugin/tags/maven-generator-plugin-0.61/pom.xml (rev 0) +++ maven-generator-plugin/tags/maven-generator-plugin-0.61/pom.xml 2008-11-14 09:28:19 UTC (rev 371) @@ -0,0 +1,90 @@ +<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginproject</artifactId> + <version>3.0</version> + </parent> + + <artifactId>maven-generator-plugin</artifactId> + +  + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + <version>0.61</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + <version>1.7.1</version> + <scope>runtime</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Plugin maven Generator</name> + <version>0.61</version> + <inceptionYear>2006</inceptionYear> + <description>maven plugin to use the lutingenerator library</description> + +  +  +  + <packaging>maven-plugin</packaging> + + <properties> +  + <labs.id>39</labs.id> + +  + <labs.project>lutingenerator</labs.project> + + </properties> + + <build> + <plugins> + + </plugins> + </build> + + +  +  +  + +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/tags/maven-generator-plugin-0.61</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/tags/maven-generator-plugin-0.61</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-generator…</url> + </scm> + +</project> Deleted: maven-generator-plugin/tags/maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java =================================================================== --- maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-07 16:56:41 UTC (rev 363) +++ maven-generator-plugin/tags/maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-14 09:28:19 UTC (rev 371) @@ -1,186 +0,0 @@ -/* *##% Plugin maven Generator - * Copyright (C) 2006 - 2008 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>. ##%*/ - -/* * - * GeneratorPlugin.java - * - * Created: 14 avril 2006 - * - * @author ruchaud - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -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.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; -import java.util.List; - -/** - * Effectue toutes les générations et copie les fichiers générés - * dans le répertoire de compilation - * - * @goal generate - */ -public class GeneratorPlugin extends AbstractMojo { - - /** - * @description Dépendance du projet. - * @parameter default-value="${project}" - * @readonly - */ - protected MavenProject project; - - /** - * Répertoire source - * - * @parameter alias="srcGenDest" - * @required - */ - protected File srcDirGen; - - /** - * Répertoire cible - * - * @parameter - * @required - */ - protected File destDirGen; - - /** - * Templates à utiliser, séparés par des virgules - * - * @parameter - * @required - */ - protected String templates; - - /** - * Templates à ne pas utiliser - * - * @parameter - */ - protected List<String> excludeTemplates; - - - /** - * Fichier à inclure - * - * @parameter - * @required - */ - protected String includes; - - /** - * Nom par défaut du paquetage généré - * - * @parameter expression="org.codelutin.${project.artifactId}" - */ - protected String defaultPackage; - - /** - * Ecrase les fichiers générés - * - * @parameter default-value="false" - */ - private boolean overwrite = false; - - public void execute() throws MojoExecutionException, MojoFailureException { - getLog().info("Effectue toutes les générations et copie les fichiers générés " - + "dans le répertoire de compilation"); - - /* Création d'un projet ant */ - Project project = new Project(); - - BuildLogger logger = new NoBannerLogger(); - logger.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); - logger.setOutputPrintStream(System.out); - logger.setErrorPrintStream(System.err); - - project.init(); - project.getBaseDir(); - project.addBuildListener(logger); - - /* Création de la tâche ant */ - GeneratorTask generator = new GeneratorTask(); - generator.setProject(project); - generator.setTaskName("Generator"); - - /* Configuration */ - generator.setOverwrite(overwrite); - - generator.setTemplates(templates); - - generator.setSrcdir(srcDirGen); - - destDirGen.mkdirs(); - generator.setDestdir(destDirGen); - - fixCompileSourceRoots(); - - generator.setProperties("defaultPackage=" + defaultPackage); - - generator.setIncludes(includes); - generator.setExcludeTemplates(excludeTemplates==null?java.util.Collections.<String>emptyList():excludeTemplates); - - /* Execution */ - generator.execute(); - } - - /** - * permet d'ajout le répertoire de génération des fichiers java dans les répertoires - * de compilation du projet Maven. - */ - 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); - } - - // Ajout aussi dans le classpath des tests - // car si la generation s'effectue en phase : generate-test-sources - // il ne trouve pas les fichiers générés - if (!project.getTestCompileSourceRoots().contains(destDirGen.getPath())) { - getLog().info("add test compile source root : " + destDirGen); - project.addTestCompileSourceRoot(destDirGen.getPath()); - Resource resources = new Resource(); - resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("add test resource root :" + resources); - project.addTestResource(resources); - } - } -} Copied: maven-generator-plugin/tags/maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java (from rev 369, maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java) =================================================================== --- maven-generator-plugin/tags/maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java (rev 0) +++ maven-generator-plugin/tags/maven-generator-plugin-0.61/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-14 09:28:19 UTC (rev 371) @@ -0,0 +1,185 @@ +/* *##% Plugin maven Generator + * Copyright (C) 2006 - 2008 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>. ##%*/ + +/* * + * GeneratorPlugin.java + * + * Created: 14 avril 2006 + * + * @author ruchaud + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ + +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.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; +import java.util.List; + +/** + * Effectue toutes les générations et copie les fichiers générés + * dans le répertoire de compilation + * + * @goal generate + */ +public class GeneratorPlugin extends AbstractMojo { + + /** + * @description Dépendance du projet. + * @parameter default-value="${project}" + * @readonly + */ + protected MavenProject project; + + /** + * Répertoire source + * + * @parameter alias="srcGenDest" + * @required + */ + protected File srcDirGen; + + /** + * Répertoire cible + * + * @parameter + * @required + */ + protected File destDirGen; + + /** + * Templates à utiliser, séparés par des virgules + * + * @parameter + * @required + */ + protected String templates; + + /** + * Templates à ne pas utiliser + * + * @parameter + */ + protected List<String> excludeTemplates; + + /** + * Fichier à inclure + * + * @parameter + * @required + */ + protected String includes; + + /** + * Nom par défaut du paquetage généré + * + * @parameter expression="org.codelutin.${project.artifactId}" + */ + protected String defaultPackage; + + /** + * Ecrase les fichiers générés + * + * @parameter default-value="false" + */ + private boolean overwrite = false; + + public void execute() throws MojoExecutionException, MojoFailureException { + getLog().info("Effectue toutes les générations et copie les fichiers générés " + + "dans le répertoire de compilation"); + + /* Création d'un projet ant */ + Project project = new Project(); + + BuildLogger logger = new NoBannerLogger(); + logger.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); + logger.setOutputPrintStream(System.out); + logger.setErrorPrintStream(System.err); + + project.init(); + project.getBaseDir(); + project.addBuildListener(logger); + + /* Création de la tâche ant */ + GeneratorTask generator = new GeneratorTask(); + generator.setProject(project); + generator.setTaskName("Generator"); + + /* Configuration */ + generator.setOverwrite(overwrite); + + generator.setTemplates(templates); + + generator.setSrcdir(srcDirGen); + + destDirGen.mkdirs(); + generator.setDestdir(destDirGen); + + fixCompileSourceRoots(); + + generator.setProperties("defaultPackage=" + defaultPackage); + + generator.setIncludes(includes); + generator.setExcludeTemplates(excludeTemplates==null?java.util.Collections.<String>emptyList():excludeTemplates); + + /* Execution */ + generator.execute(); + } + + /** + * permet d'ajout le répertoire de génération des fichiers java dans les répertoires + * de compilation du projet Maven. + */ + 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); + } + + // Ajout aussi dans le classpath des tests + // car si la generation s'effectue en phase : generate-test-sources + // il ne trouve pas les fichiers générés + if (!project.getTestCompileSourceRoots().contains(destDirGen.getPath())) { + getLog().info("add test compile source root : " + destDirGen); + project.addTestCompileSourceRoot(destDirGen.getPath()); + Resource resources = new Resource(); + resources.setDirectory(destDirGen.getAbsolutePath()); + resources.setExcludes(Arrays.asList("**/*.java")); + getLog().info("add test resource root :" + resources); + project.addTestResource(resources); + } + } +}

1 0

[Lutingenerator-commits] r370 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:28:15 +0000 (Fri, 14 Nov 2008) New Revision: 370 Modified: maven-generator-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release maven-generator-plugin-0.61 Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-11-14 09:27:43 UTC (rev 369) +++ maven-generator-plugin/trunk/pom.xml 2008-11-14 09:28:15 UTC (rev 370) @@ -51,7 +51,7 @@   <name>Plugin maven Generator</name> - <version>0.61-SNAPSHOT</version> + <version>0.61</version> <inceptionYear>2006</inceptionYear> <description>maven plugin to use the lutingenerator library</description> @@ -82,9 +82,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/tags/maven-generator-plugin-0.61</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/maven-generator-plugin/tags/maven-generator-plugin-0.61</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-generator…</url> </scm> </project>

1 0

[Lutingenerator-commits] r369 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:27:43 +0000 (Fri, 14 Nov 2008) New Revision: 369 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: Format 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-14 09:26:12 UTC (rev 368) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-14 09:27:43 UTC (rev 369) @@ -89,7 +89,6 @@ */ protected List<String> excludeTemplates; - /** * Fichier à inclure *

1 0

[Lutingenerator-commits] r368 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:26:12 +0000 (Fri, 14 Nov 2008) New Revision: 368 Modified: maven-generator-plugin/trunk/pom.xml Log: Use release version Modified: maven-generator-plugin/trunk/pom.xml =================================================================== --- maven-generator-plugin/trunk/pom.xml 2008-11-14 09:25:48 UTC (rev 367) +++ maven-generator-plugin/trunk/pom.xml 2008-11-14 09:26:12 UTC (rev 368) @@ -20,7 +20,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> - <version>0.61-SNAPSHOT</version> + <version>0.61</version> <scope>compile</scope> </dependency> @@ -81,7 +81,7 @@   - <scm> + <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> <url>${maven.scm.url}</url>

1 0

[Lutingenerator-commits] r367 - lutingenerator/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:25:48 +0000 (Fri, 14 Nov 2008) New Revision: 367 Modified: lutingenerator/trunk/pom.xml Log: Correct vars Modified: lutingenerator/trunk/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2008-11-14 09:17:39 UTC (rev 366) +++ lutingenerator/trunk/pom.xml 2008-11-14 09:25:48 UTC (rev 367) @@ -95,10 +95,10 @@   - <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/trunk</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutingenerator/…</url> + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project>

1 0

[Lutingenerator-commits] r366 - lutingenerator/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:17:39 +0000 (Fri, 14 Nov 2008) New Revision: 366 Modified: lutingenerator/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: lutingenerator/trunk/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2008-11-14 09:17:36 UTC (rev 365) +++ lutingenerator/trunk/pom.xml 2008-11-14 09:17:39 UTC (rev 366) @@ -64,7 +64,7 @@   <name>Lutin Generator</name> - <version>0.61</version> + <version>0.62-SNAPSHOT</version> <description>Générateurs en tout genre.</description> <inceptionYear>2004</inceptionYear> @@ -96,9 +96,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/tags/lutingenerator-0.61</connection> - <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/tags/lutingenerator-0.61</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutingenerator/…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/trunk</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutingenerator/…</url> </scm> </project>

1 0

[Lutingenerator-commits] r365 - in lutingenerator/tags: . lutingenerator-0.61
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:17:36 +0000 (Fri, 14 Nov 2008) New Revision: 365 Added: lutingenerator/tags/lutingenerator-0.61/ lutingenerator/tags/lutingenerator-0.61/pom.xml Removed: lutingenerator/tags/lutingenerator-0.61/pom.xml Log: [maven-release-plugin] copy for tag lutingenerator-0.61 Copied: lutingenerator/tags/lutingenerator-0.61 (from rev 363, lutingenerator/trunk) Deleted: lutingenerator/tags/lutingenerator-0.61/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2008-11-07 16:56:41 UTC (rev 363) +++ lutingenerator/tags/lutingenerator-0.61/pom.xml 2008-11-14 09:17:36 UTC (rev 365) @@ -1,104 +0,0 @@ -<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.0</version> - </parent> - - <artifactId>lutingenerator</artifactId> - -  - <dependencies> - - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>0.31</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - </dependencies> - -  -  -  - <name>Lutin Generator</name> - <version>0.61-SNAPSHOT</version> - <description>Générateurs en tout genre.</description> - <inceptionYear>2004</inceptionYear> - -  -  -  - <packaging>jar</packaging> - - <properties> - -  - <labs.id>39</labs.id> - - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: lutingenerator/tags/lutingenerator-0.61/pom.xml (from rev 364, lutingenerator/trunk/pom.xml) =================================================================== --- lutingenerator/tags/lutingenerator-0.61/pom.xml (rev 0) +++ lutingenerator/tags/lutingenerator-0.61/pom.xml 2008-11-14 09:17:36 UTC (rev 365) @@ -0,0 +1,104 @@ +<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.0</version> + </parent> + + <artifactId>lutingenerator</artifactId> + +  + <dependencies> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>0.31</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> + +  +  +  + <name>Lutin Generator</name> + <version>0.61</version> + <description>Générateurs en tout genre.</description> + <inceptionYear>2004</inceptionYear> + +  +  +  + <packaging>jar</packaging> + + <properties> + +  + <labs.id>39</labs.id> + + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/tags/lutingenerator-0.61</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/tags/lutingenerator-0.61</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutingenerator/…</url> + </scm> + +</project>

1 0

[Lutingenerator-commits] r364 - lutingenerator/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 14, 2008

Nov. 14, 2008

Author: chatellier Date: 2008-11-14 09:17:32 +0000 (Fri, 14 Nov 2008) New Revision: 364 Modified: lutingenerator/trunk/pom.xml Log: [maven-release-plugin] prepare release lutingenerator-0.61 Modified: lutingenerator/trunk/pom.xml =================================================================== --- lutingenerator/trunk/pom.xml 2008-11-07 16:56:41 UTC (rev 363) +++ lutingenerator/trunk/pom.xml 2008-11-14 09:17:32 UTC (rev 364) @@ -64,7 +64,7 @@   <name>Lutin Generator</name> - <version>0.61-SNAPSHOT</version> + <version>0.61</version> <description>Générateurs en tout genre.</description> <inceptionYear>2004</inceptionYear> @@ -96,9 +96,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/tags/lutingenerator-0.61</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/lutingenerator/lutingenerator/tags/lutingenerator-0.61</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutingenerator/…</url> </scm> </project>

1 0

[Lutingenerator-commits] r363 - maven-generator-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org Nov. 7, 2008

Nov. 7, 2008

Author: chatellier Date: 2008-11-07 16:56:41 +0000 (Fri, 07 Nov 2008) New Revision: 363 Modified: maven-generator-plugin/trunk/changelog Log: Update changelog Modified: maven-generator-plugin/trunk/changelog =================================================================== --- maven-generator-plugin/trunk/changelog 2008-11-07 13:31:23 UTC (rev 362) +++ maven-generator-plugin/trunk/changelog 2008-11-07 16:56:41 UTC (rev 363) @@ -1,4 +1,6 @@ 0.61 chemit 200811?? + * 20081107 [chatellier] + - add test compile dir and test resources in generation gaol * 20081101 [chemit] - add an excludeTemplates property on GeneratorPlugin to permit exclusion of generators for some composite generator - bump lutingenerator to 0.61

1 0

[Lutingenerator-commits] r362 - maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin
by chatellier＠users.labs.libre-entreprise.org Nov. 7, 2008

Nov. 7, 2008

Author: chatellier Date: 2008-11-07 13:31:23 +0000 (Fri, 07 Nov 2008) New Revision: 362 Modified: maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java Log: Add test phase generated source in classpath too. 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-07 10:27:19 UTC (rev 361) +++ maven-generator-plugin/trunk/src/main/java/org/codelutin/generator/plugin/GeneratorPlugin.java 2008-11-07 13:31:23 UTC (rev 362) @@ -159,6 +159,7 @@ * de compilation du projet Maven. */ protected void fixCompileSourceRoots() { + if (!project.getCompileSourceRoots().contains(destDirGen.getPath())) { getLog().info("add compile source root : " + destDirGen); project.addCompileSourceRoot(destDirGen.getPath()); @@ -169,5 +170,17 @@ project.addResource(resources); } + // Ajout aussi dans le classpath des tests + // car si la generation s'effectue en phase : generate-test-sources + // il ne trouve pas les fichiers générés + if (!project.getTestCompileSourceRoots().contains(destDirGen.getPath())) { + getLog().info("add test compile source root : " + destDirGen); + project.addTestCompileSourceRoot(destDirGen.getPath()); + Resource resources = new Resource(); + resources.setDirectory(destDirGen.getAbsolutePath()); + resources.setExcludes(Arrays.asList("**/*.java")); + getLog().info("add test resource root :" + resources); + project.addTestResource(resources); + } } }

1 0