September 2008 - Processor-commits - mailman.cloud.codelutin.com

[Lutinprocessor-commits] r124 - trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin
by thimel＠users.labs.libre-entreprise.org 22 Sep '08

22 Sep '08

Author: thimel Date: 2008-09-22 13:32:22 +0000 (Mon, 22 Sep 2008) New Revision: 124 Modified: trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java Log: Modified plugin to adopt a maven2 behaviour Modified: trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2008-09-22 12:33:18 UTC (rev 123) +++ trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2008-09-22 13:32:22 UTC (rev 124) @@ -56,16 +56,14 @@ /** * Répertoire source * - * @parameter - * @required + * @parameter expression="${processor.srcDir}" default-value="${basedir}/src/main/java" */ protected File srcDir; /** * Répertoire cible * - * @parameter - * @required + * @parameter expression="${processor.destDir}" default-value="${basedir}/target/processed-sources/java" */ protected File destDir; @@ -124,22 +122,27 @@ getLog().info("Génération des fichiers à partir de lutin processor"); /* Création d'un projet ant */ - Project project = new Project(); + Project antProject = 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); + antProject.init(); + antProject.getBaseDir(); + antProject.addBuildListener(logger); /* Création de la tâche ant ProcessorTask */ ProcessorTask processor = new ProcessorTask(); - processor.setProject(project); + processor.setProject(antProject); processor.setTaskName("Processor"); + if (verbose) { + getLog().info("srcDir is " + srcDir); + getLog().info("destDir is " + destDir); + } + /* Configuration */ processor.setVerbose(verbose); processor.setSrcdir(srcDir); @@ -169,7 +172,16 @@ * de compilation du projet Maven. */ protected void fixCompileSourceRoots() { + if (project.getCompileSourceRoots().contains(srcDir.getPath())) { + if (verbose) { + getLog().info("srcDir found in compileSourceRoots, removing"); + } + project.getCompileSourceRoots().remove(srcDir.getPath()); + } if (!project.getCompileSourceRoots().contains(destDir.getPath())) { + if (verbose) { + getLog().info("destDir not found in compileSourceRoots, adding"); + } project.addCompileSourceRoot(destDir.getPath()); } }

1 0

[Lutinprocessor-commits] r123 - trunk/maven-processor-plugin
by thimel＠users.labs.libre-entreprise.org 22 Sep '08

22 Sep '08

Author: thimel Date: 2008-09-22 12:33:18 +0000 (Mon, 22 Sep 2008) New Revision: 123 Added: trunk/maven-processor-plugin/changelog Modified: trunk/maven-processor-plugin/pom.xml Log: Added changelog Deploy version 0.15 using lutinpluginproject 3.0 Added: trunk/maven-processor-plugin/changelog =================================================================== --- trunk/maven-processor-plugin/changelog (rev 0) +++ trunk/maven-processor-plugin/changelog 2008-09-22 12:33:18 UTC (rev 123) @@ -0,0 +1,4 @@ +ver-0-15 thimel 20080922 + * Added changelog + * plugin is now a lutinpluginproject 3.0 + * groupId is org.codelutin Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2008-09-22 12:28:39 UTC (rev 122) +++ trunk/maven-processor-plugin/pom.xml 2008-09-22 12:33:18 UTC (rev 123) @@ -8,8 +8,8 @@  <parent> <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>2.5</version> + <artifactId>lutinpluginproject</artifactId> + <version>3.0</version> </parent>  @@ -21,7 +21,7 @@ <packaging>maven-plugin</packaging>  - <version>0.15-SNAPSHOT</version> + <version>0.15</version>  <inceptionYear>2006</inceptionYear> @@ -54,23 +54,9 @@  <dependencies> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.9</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.9</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinprocessor</artifactId> - <version>0.15-SNAPSHOT</version> + <version>0.15</version> <scope>compile</scope> </dependency> </dependencies>

1 0

[Lutinprocessor-commits] r122 - trunk/lutinprocessor
by thimel＠users.labs.libre-entreprise.org 22 Sep '08

22 Sep '08

Author: thimel Date: 2008-09-22 12:28:39 +0000 (Mon, 22 Sep 2008) New Revision: 122 Modified: trunk/lutinprocessor/changelog trunk/lutinprocessor/pom.xml Log: Added changelog Deploy 0.15 Modified: trunk/lutinprocessor/changelog =================================================================== --- trunk/lutinprocessor/changelog 2008-09-22 08:24:38 UTC (rev 121) +++ trunk/lutinprocessor/changelog 2008-09-22 12:28:39 UTC (rev 122) @@ -1,3 +1,6 @@ +ver-0-15 thimel (20080922) + * Parent is org.codelutin:lutinproject:3.0 + ver-0-14 chemit (2008????) * utilisation super-pom org.codelutin:lutinproject:2.4 (reusingage de directory layout) * passage en licence lgpl v3 Modified: trunk/lutinprocessor/pom.xml =================================================================== --- trunk/lutinprocessor/pom.xml 2008-09-22 08:24:38 UTC (rev 121) +++ trunk/lutinprocessor/pom.xml 2008-09-22 12:28:39 UTC (rev 122) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.5</version> + <version>3.0</version> </parent> <artifactId>lutinprocessor</artifactId> @@ -49,7 +49,7 @@ <labs.id>28</labs.id>  -  + <labs.project>lutinprocessor</labs.project>  <maven.scm.url>https://${labs.host}/plugins/scmsvn/viewcvs.php/trunk/${pom.artifactId}?root=${labs.project} @@ -62,7 +62,7 @@  <plugin> - <groupId>org.codelutin.maven.plugins</groupId> + <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> </plugin>

1 0

[Lutinprocessor-commits] r121 - trunk/maven-processor-plugin
by chatellier＠users.labs.libre-entreprise.org 22 Sep '08

22 Sep '08

Author: chatellier Date: 2008-09-22 08:24:38 +0000 (Mon, 22 Sep 2008) New Revision: 121 Modified: trunk/maven-processor-plugin/pom.xml Log: Use new plugins groupId Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2008-09-22 07:45:33 UTC (rev 120) +++ trunk/maven-processor-plugin/pom.xml 2008-09-22 08:24:38 UTC (rev 121) @@ -13,7 +13,7 @@ </parent>  - <groupId>org.codelutin.maven.plugins</groupId> + <groupId>org.codelutin</groupId> <artifactId>maven-processor-plugin</artifactId> <name>Plugin maven Lutin Processor</name>

1 0

[Lutinprocessor-commits] r120 - trunk/lutinprocessor
by thimel＠users.labs.libre-entreprise.org 22 Sep '08

22 Sep '08

Author: thimel Date: 2008-09-22 07:45:33 +0000 (Mon, 22 Sep 2008) New Revision: 120 Modified: trunk/lutinprocessor/pom.xml Log: Deploy lutinprocessor-0.15 Modified: trunk/lutinprocessor/pom.xml =================================================================== --- trunk/lutinprocessor/pom.xml 2008-09-02 15:08:26 UTC (rev 119) +++ trunk/lutinprocessor/pom.xml 2008-09-22 07:45:33 UTC (rev 120) @@ -30,7 +30,7 @@  <name>Lutin file processor</name> - <version>0.15-SNAPSHOT</version> + <version>0.15</version> <description> Cette librairie permet la création de filtre sur les fichiers sources. </description>

1 0

[Lutinprocessor-commits] r119 - in trunk/maven-processor-plugin: . src src/main src/main/java/org/codelutin/processor/plugin
by chatellier＠users.labs.libre-entreprise.org 02 Sep '08

02 Sep '08

Author: chatellier Date: 2008-09-02 15:08:26 +0000 (Tue, 02 Sep 2008) New Revision: 119 Added: trunk/maven-processor-plugin/src/main/ trunk/maven-processor-plugin/src/main/java/ trunk/maven-processor-plugin/src/main/resources/ trunk/maven-processor-plugin/src/site/ Removed: trunk/maven-processor-plugin/site/ trunk/maven-processor-plugin/src/java/ Modified: trunk/maven-processor-plugin/pom.xml trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java Log: Maven2 layout and LGPL3 Modified: trunk/maven-processor-plugin/pom.xml =================================================================== --- trunk/maven-processor-plugin/pom.xml 2008-09-02 15:06:54 UTC (rev 118) +++ trunk/maven-processor-plugin/pom.xml 2008-09-02 15:08:26 UTC (rev 119) @@ -5,15 +5,15 @@  <modelVersion>4.0.0</modelVersion> -  -  + <parent> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> - </parent--> + <version>2.5</version> + </parent>  - <groupId>lutinplugin</groupId> + <groupId>org.codelutin.maven.plugins</groupId> <artifactId>maven-processor-plugin</artifactId> <name>Plugin maven Lutin Processor</name> @@ -21,71 +21,22 @@ <packaging>maven-plugin</packaging>  - <version>0.13-SNAPSHOT</version> + <version>0.15-SNAPSHOT</version>  <inceptionYear>2006</inceptionYear> <properties> -  - <maven.src.dir>${basedir}/src</maven.src.dir> +  + <labs.id>28</labs.id> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> - <maven.compile.encoding>UTF-8</maven.compile.encoding> +  + <labs.project>lutinprocessor</labs.project> +  + <maven.test.skip>false</maven.test.skip> </properties> -  - <build> - <sourceDirectory>${maven.src.dir}/java</sourceDirectory> - <testSourceDirectory>${maven.src.dir}/test</testSourceDirectory> - - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${maven.compile.encoding}</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> - <distributionManagement> - <repository> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> - </repository> - - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/lutinprocessor/htdocs/${pom.art…</url> - </site> - </distributionManagement> -  - -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=28</url> - </issueManagement> -  <contributors> <contributor> @@ -105,58 +56,23 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>2.0</version> + <version>2.0.9</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>2.0.4</version> + <version>2.0.9</version> <scope>compile</scope> </dependency> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinprocessor</artifactId> - <version>0.13-SNAPSHOT</version> + <version>0.15-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> -  - <mailingLists> - <mailingList> - <name>lutinprocessor-cvscomit</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinprocessor-cvsc…</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinprocessor-cvsc…</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/lutinprocessor-cvscommit/</archive> - </mailingList> - - <mailingList> - <name>lutinprocessor-devel</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinprocessor-devel</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinprocessor-devel</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/lutinprocessor-devel/</archive> - </mailingList> - - <mailingList> - <name>lutinprocessor-user</name> - <subscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinprocessor-user</subscribe> - <unsubscribe>http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinprocessor-user</unsubscribe> - <archive>http://lists.labs.libre-entreprise.org/pipermail/lutinprocessor-user/</archive> - </mailingList> - </mailingLists> - - <scm> - <url>http://cvs.labs.libre-entreprise.org/cgi-bin/cvsweb.cgi/?cvsroot=lutinproce…</url> - <connection>scm:cvs:pserver:anonymous@cvs.labs.libre-entreprise.org:/cvsroot/lutinprocessor:${pom.artifactId} - </connection> - </scm> -  - </project> Copied: trunk/maven-processor-plugin/src/main/java (from rev 117, trunk/maven-processor-plugin/src/java) Modified: trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java =================================================================== --- trunk/maven-processor-plugin/src/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2008-08-18 09:54:05 UTC (rev 117) +++ trunk/maven-processor-plugin/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2008-09-02 15:08:26 UTC (rev 119) @@ -1,21 +1,19 @@ -/* *##% - * Copyright (C) 2006 - * Code Lutin, C?dric Pineau, Benjamin Poussin +/* *##% Plugin maven Lutin Processor + * Copyright (C) 2006 - 2008 CodeLutin * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * 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 Public License for more details. + * GNU General Lesser Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * 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>. ##%*/ /* * * ProcessorPlugin.java @@ -176,4 +174,4 @@ } } -} \ No newline at end of file +} Copied: trunk/maven-processor-plugin/src/site (from rev 117, trunk/maven-processor-plugin/site)

1 0

[Lutinprocessor-commits] r118 - trunk/lutinprocessor
by chatellier＠users.labs.libre-entreprise.org 02 Sep '08

02 Sep '08

Author: chatellier Date: 2008-09-02 15:06:54 +0000 (Tue, 02 Sep 2008) New Revision: 118 Modified: trunk/lutinprocessor/pom.xml Log: Update versions Modified: trunk/lutinprocessor/pom.xml =================================================================== --- trunk/lutinprocessor/pom.xml 2008-08-18 09:54:05 UTC (rev 117) +++ trunk/lutinprocessor/pom.xml 2008-09-02 15:06:54 UTC (rev 118) @@ -11,16 +11,16 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.4</version> + <version>2.5</version> </parent> <artifactId>lutinprocessor</artifactId> <dependencies> <dependency> - <groupId>ant</groupId> + <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.6.5</version> + <version>1.7.1</version> <scope>compile</scope> </dependency> </dependencies> @@ -30,7 +30,7 @@  <name>Lutin file processor</name> - <version>0.14</version> + <version>0.15-SNAPSHOT</version> <description> Cette librairie permet la création de filtre sur les fichiers sources. </description> @@ -62,7 +62,7 @@  <plugin> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin.maven.plugins</groupId> <artifactId>maven-jrst-plugin</artifactId> </plugin>

1 0