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

[Lutinprocessor-commits] r190 - in lutinprocessor/trunk: . src/main/assembly
by tchemit＠users.labs.libre-entreprise.org 10 May '09

10 May '09

Author: tchemit Date: 2009-05-10 16:55:36 +0000 (Sun, 10 May 2009) New Revision: 190 Modified: lutinprocessor/trunk/changelog.txt lutinprocessor/trunk/pom.xml lutinprocessor/trunk/src/main/assembly/deps.xml lutinprocessor/trunk/src/main/assembly/full.xml Log: fix issues in assembly descriptor and attach the plugin execution in release profile otherwise we must do a checkout of the released version, then apply goal, not very automatic method... :) Modified: lutinprocessor/trunk/changelog.txt =================================================================== --- lutinprocessor/trunk/changelog.txt 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/changelog.txt 2009-05-10 16:55:36 UTC (rev 190) @@ -5,6 +5,7 @@ * bump lutinproject to 3.5.4, maven-license-switcher-plugin to 0.8 * use pluginManagment for plugins configuration * use doxia-modules-jrst instead of maven-jrst-plugin + * fix issues in assembly descriptor and attach the plugin execution in release profile ver-0-17 chemit (20090218) * Parent is org.codelutin:lutinproject:3.4 Modified: lutinprocessor/trunk/pom.xml =================================================================== --- lutinprocessor/trunk/pom.xml 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/pom.xml 2009-05-10 16:55:36 UTC (rev 190) @@ -55,48 +55,7 @@ </properties> <build> - <plugins> - -  -  - -  - </plugins> - + <pluginManagement> <plugins> @@ -108,14 +67,7 @@ <descriptor>src/main/assembly/deps.xml</descriptor> <descriptor>src/main/assembly/full.xml</descriptor> </descriptors> - </configuration> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> + </configuration> </plugin> <plugin> @@ -199,6 +151,14 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> </plugin> </plugins> Modified: lutinprocessor/trunk/src/main/assembly/deps.xml =================================================================== --- lutinprocessor/trunk/src/main/assembly/deps.xml 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/src/main/assembly/deps.xml 2009-05-10 16:55:36 UTC (rev 190) @@ -1,3 +1,4 @@ + <assembly> <id>deps</id> <formats> @@ -13,22 +14,34 @@ </excludes> <scope>runtime</scope> </dependencySet> - </dependencySets> - <files> - <file> -  - <source>target/${project.build.finalName}.jar</source> - </file> -  - </files> + </dependencySets> + <fileSets> <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + <exclude>*-javadoc.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> <include>README*</include> <include>LICENSE*</include> + <include>pom.xml</include> </includes> </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> </fileSets> </assembly> \ No newline at end of file Modified: lutinprocessor/trunk/src/main/assembly/full.xml =================================================================== --- lutinprocessor/trunk/src/main/assembly/full.xml 2009-05-10 16:26:52 UTC (rev 189) +++ lutinprocessor/trunk/src/main/assembly/full.xml 2009-05-10 16:55:36 UTC (rev 190) @@ -1,3 +1,4 @@ + <assembly> <id>full</id> <formats> @@ -13,26 +14,35 @@ <scope>runtime</scope> </dependencySet> </dependencySets> - <files> - <file> -  - <source>target/${project.build.finalName}.jar</source> - </file> -  - </files> <fileSets> <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> <include>README*</include> <include>LICENSE*</include> <include>pom.xml</include> </includes> </fileSet> <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + <fileSet> <directory>src</directory> - <useDefaultExcludes>true</useDefaultExcludes> +  </fileSet> </fileSets> </assembly> \ No newline at end of file

1 0

[Lutinprocessor-commits] r189 - in lutinprocessor/trunk: . src/site src/site/rst
by tchemit＠users.labs.libre-entreprise.org 10 May '09

10 May '09

Author: tchemit Date: 2009-05-10 16:26:52 +0000 (Sun, 10 May 2009) New Revision: 189 Added: lutinprocessor/trunk/src/site/rst/ lutinprocessor/trunk/src/site/rst/Todo.rst lutinprocessor/trunk/src/site/rst/index.rst Modified: lutinprocessor/trunk/changelog.txt lutinprocessor/trunk/pom.xml Log: bump lutinproject to 3.5.4, maven-license-switcher-plugin to 0.8 use pluginManagment for plugins configuration use doxia-modules-jrst instead of maven-jrst-plugin and fix jrst issues Modified: lutinprocessor/trunk/changelog.txt =================================================================== --- lutinprocessor/trunk/changelog.txt 2009-05-10 16:26:36 UTC (rev 188) +++ lutinprocessor/trunk/changelog.txt 2009-05-10 16:26:52 UTC (rev 189) @@ -1,3 +1,11 @@ +ver-1.0.0 ? + * migrate to nuiton + +ver-0-18 chemit (20090218) + * bump lutinproject to 3.5.4, maven-license-switcher-plugin to 0.8 + * use pluginManagment for plugins configuration + * use doxia-modules-jrst instead of maven-jrst-plugin + ver-0-17 chemit (20090218) * Parent is org.codelutin:lutinproject:3.4 * use same version as maven-processor-plugin Modified: lutinprocessor/trunk/pom.xml =================================================================== --- lutinprocessor/trunk/pom.xml 2009-05-10 16:26:36 UTC (rev 188) +++ lutinprocessor/trunk/pom.xml 2009-05-10 16:26:52 UTC (rev 189) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.4</version> </parent> <artifactId>lutinprocessor</artifactId> @@ -49,13 +49,16 @@  <labs.project>lutinprocessor</labs.project> +  + <maven.site.locales>fr</maven.site.locales> + </properties> <build> <plugins>  - <plugin> +  - <plugin> +  </plugins> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.1</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <locales>${maven.site.locales}</locales> + <siteDirectory>src/site</siteDirectory> + </configuration> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build>  @@ -101,9 +143,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinprocessor/lutinprocessor/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinprocessor/lutinprocessor/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinprocessor/…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>  @@ -135,11 +177,12 @@ </activation> <build> <plugins> +  <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6</version> + <version>0.8</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration> @@ -153,6 +196,11 @@ </execution> </executions> </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + </plugin> + </plugins> </build> </profile> Copied: lutinprocessor/trunk/src/site/rst/Todo.rst (from rev 187, lutinprocessor/trunk/src/site/fr/rst/Todo.rst) =================================================================== --- lutinprocessor/trunk/src/site/rst/Todo.rst (rev 0) +++ lutinprocessor/trunk/src/site/rst/Todo.rst 2009-05-10 16:26:52 UTC (rev 189) @@ -0,0 +1,10 @@ +==== +Todo +==== + +Voici la liste des tâches qui reste à faire. Si quelqu'un souhaite aider, ou +a une idée à proposer il ne faut pas hésiter. + +- La documentation utilisateur +- La documentation développeur + Property changes on: lutinprocessor/trunk/src/site/rst/Todo.rst ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native Copied: lutinprocessor/trunk/src/site/rst/index.rst (from rev 187, lutinprocessor/trunk/src/site/fr/rst/index.rst) =================================================================== (Binary files differ) Property changes on: lutinprocessor/trunk/src/site/rst/index.rst ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo +

1 0

[Lutinprocessor-commits] r188 - lutinprocessor/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 10 May '09

10 May '09

Author: tchemit Date: 2009-05-10 16:26:36 +0000 (Sun, 10 May 2009) New Revision: 188 Removed: lutinprocessor/trunk/src/site/fr/ Log: bump lutinproject to 3.5.4, maven-license-switcher-plugin to 0.8 use pluginManagment for plugins configuration use doxia-modules-jrst instead of maven-jrst-plugin and fix jrst issues

1 0

[Lutinprocessor-commits] r187 - lutinprocessor/trunk
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 12:37:57 +0000 (Thu, 09 Apr 2009) New Revision: 187 Modified: lutinprocessor/trunk/pom.xml Log: Fix xsd location Modified: lutinprocessor/trunk/pom.xml =================================================================== --- lutinprocessor/trunk/pom.xml 2009-04-09 12:35:38 UTC (rev 186) +++ lutinprocessor/trunk/pom.xml 2009-04-09 12:37:57 UTC (rev 187) @@ -1,5 +1,5 @@ <?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"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -139,7 +139,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

[Lutinprocessor-commits] r186 - maven-processor-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org 09 Apr '09

09 Apr '09

Author: chatellier Date: 2009-04-09 12:35:38 +0000 (Thu, 09 Apr 2009) New Revision: 186 Modified: maven-processor-plugin/trunk/pom.xml Log: Fix xsd location Modified: maven-processor-plugin/trunk/pom.xml =================================================================== --- maven-processor-plugin/trunk/pom.xml 2009-02-23 08:48:30 UTC (rev 185) +++ maven-processor-plugin/trunk/pom.xml 2009-04-09 12:35:38 UTC (rev 186) @@ -1,5 +1,5 @@ <?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"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -188,7 +188,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

[Lutinprocessor-commits] r185 - lutinprocessor/trunk lutinprocessor/trunk/src/main lutinprocessor/trunk/src/main/assembly maven-processor-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org 23 Feb '09

23 Feb '09

Author: chatellier Date: 2009-02-23 08:48:30 +0000 (Mon, 23 Feb 2009) New Revision: 185 Added: lutinprocessor/trunk/src/main/assembly/ lutinprocessor/trunk/src/main/assembly/deps.xml lutinprocessor/trunk/src/main/assembly/full.xml Modified: lutinprocessor/trunk/pom.xml maven-processor-plugin/trunk/pom.xml Log: Update some version, and add some assembly. Modified: lutinprocessor/trunk/pom.xml =================================================================== --- lutinprocessor/trunk/pom.xml 2009-02-20 16:05:39 UTC (rev 184) +++ lutinprocessor/trunk/pom.xml 2009-02-23 08:48:30 UTC (rev 185) @@ -76,6 +76,22 @@ </executions> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Added: lutinprocessor/trunk/src/main/assembly/deps.xml =================================================================== --- lutinprocessor/trunk/src/main/assembly/deps.xml (rev 0) +++ lutinprocessor/trunk/src/main/assembly/deps.xml 2009-02-23 08:48:30 UTC (rev 185) @@ -0,0 +1,34 @@ +<assembly> + <id>deps</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>junit:junit</exclude> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> +  + <source>target/${project.build.finalName}.jar</source> + </file> +  + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: lutinprocessor/trunk/src/main/assembly/full.xml =================================================================== --- lutinprocessor/trunk/src/main/assembly/full.xml (rev 0) +++ lutinprocessor/trunk/src/main/assembly/full.xml 2009-02-23 08:48:30 UTC (rev 185) @@ -0,0 +1,38 @@ +<assembly> + <id>full</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <files> + <file> +  + <source>target/${project.build.finalName}.jar</source> + </file> +  + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Modified: maven-processor-plugin/trunk/pom.xml =================================================================== --- maven-processor-plugin/trunk/pom.xml 2009-02-20 16:05:39 UTC (rev 184) +++ maven-processor-plugin/trunk/pom.xml 2009-02-23 08:48:30 UTC (rev 185) @@ -89,7 +89,7 @@ <lutinpluginutil.version>0.3</lutinpluginutil.version> - <maven.version>2.0.9</maven.version> + <maven.version>2.0.10</maven.version> </properties> <build>

1 0

[Lutinprocessor-commits] r184 - in maven-processor-plugin/trunk/src: main/java/org/codelutin/processor/plugin site
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 16:05:39 +0000 (Fri, 20 Feb 2009) New Revision: 184 Modified: maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java maven-processor-plugin/trunk/src/site/site.xml Log: Update site Modified: maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java =================================================================== --- maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2009-02-20 16:03:05 UTC (rev 183) +++ maven-processor-plugin/trunk/src/main/java/org/codelutin/processor/plugin/ProcessorPlugin.java 2009-02-20 16:05:39 UTC (rev 184) @@ -1,5 +1,5 @@ /* *##% Plugin maven Lutin Processor - * Copyright (C) 2006 - 2008 CodeLutin + * Copyright (C) 2006 - 2009 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 @@ -15,18 +15,6 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -/* * - * ProcessorPlugin.java - * - * Created: 14 avril 2006 - * - * @author ruchaud - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package org.codelutin.processor.plugin; import org.apache.maven.plugin.AbstractMojo; @@ -36,12 +24,21 @@ import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; import org.codelutin.processor.ant.ProcessorTask; +import org.codelutin.processor.filters.NoActionFilter; import java.io.File; /** - * Plugin for Lutin Processor + * Maven2 plugin for Lutin Processor. * + * Created: 14 avril 2006 + * + * @author ruchaud + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + * * @goal process */ public class ProcessorPlugin extends AbstractMojo { @@ -57,6 +54,7 @@ * Répertoire source * * @parameter expression="${processor.srcDir}" default-value="${basedir}/src/main/java" + * @since 0.10 */ protected File srcDir; @@ -64,47 +62,60 @@ * Répertoire cible * * @parameter expression="${processor.destDir}" default-value="${basedir}/target/processed-sources/java" + * @since 0.10 */ protected File destDir; /** * Fichier à inclure * - * @parameter + * @parameter expression="${processor.includes}" + * @since 0.10 */ protected String[] includes = new String[]{}; /** * Fichier à exclure * - * @parameter + * @parameter expression="${processor.excludes}" + * @since 0.10 */ protected String[] excludes = new String[]{}; - /** @parameter */ + /** + * ??? + * @parameter expression="${processor.fileInPattern}" default-value="" + * @since 0.10 + */ protected String fileInPattern = ""; - /** @parameter */ + /** + * @parameter expression="${processor.fileOutPattern}" default-value="" + * @since 0.10 + */ protected String fileOutPattern = ""; /** * Les filtres a utiliser par le processor, séparés par des virgules * - * @parameter default-value="org.codelutin.processor.filters.NoActionFilter" + * @parameter expression="${processor.filters}" default-value="org.codelutin.processor.filters.NoActionFilter" + * @since 0.10 */ - protected String filters = "org.codelutin.processor.filters.NoActionFilter"; + protected String filters = NoActionFilter.class.getName(); /** * Ecrase les fichiers générés * - * @parameter default-value="false" + * @parameter expression="${processor.overwrite}" default-value="false" + * @since 0.10 */ private boolean overwrite = false; /** * Permet d'obtenir plus d'information * - * @parameter default-value="false" + * @parameter expression="${processor.verbose}" default-value="${maven.verbose}" + * @since 0.10 */ private boolean verbose = false; @@ -115,6 +126,7 @@ * TODO Ce flag doit disparaitre dans la prochaine release (uniquement utilisée pour compatibilité) * * @parameter expression="${processor.addCompileDirectory}" default-value="false" + * @since 0.16 */ protected boolean addCompileDirectory; Modified: maven-processor-plugin/trunk/src/site/site.xml =================================================================== --- maven-processor-plugin/trunk/src/site/site.xml 2009-02-20 16:03:05 UTC (rev 183) +++ maven-processor-plugin/trunk/src/site/site.xml 2009-02-20 16:05:39 UTC (rev 184) @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="MavenProcessorPlugin"> - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.3</version> + </skin> <bannerLeft> <name>Maven-Processor-Plugin</name> @@ -31,7 +33,7 @@ <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinplugin/maven-proc…" name="T�l�chargement"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/maven-pr…" name="Téléchargement"/> </menu> <!--<menu name="Developpeur">

1 0

[Lutinprocessor-commits] r183 - in lutinprocessor/trunk/src/site: . fr
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 16:03:05 +0000 (Fri, 20 Feb 2009) New Revision: 183 Added: lutinprocessor/trunk/src/site/fr/ lutinprocessor/trunk/src/site/site_fr.xml Removed: lutinprocessor/trunk/src/site/site.xml lutinprocessor/trunk/src/site/xdoc/ Log: Update site Copied: lutinprocessor/trunk/src/site/fr (from rev 177, lutinprocessor/trunk/src/site/xdoc/fr) Property changes on: lutinprocessor/trunk/src/site/fr ___________________________________________________________________ Name: svn:mergeinfo + Deleted: lutinprocessor/trunk/src/site/site.xml =================================================================== --- lutinprocessor/trunk/src/site/site.xml 2009-02-20 15:55:13 UTC (rev 182) +++ lutinprocessor/trunk/src/site/site.xml 2009-02-20 16:03:05 UTC (rev 183) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> - </skin> - - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - <links> - <item name="Maven-processor-plugin" href="http://lutinprocessor.labs.libre-entreprise.org/maven-processor-plugin/"/> - <item name="le Labs" href="http://labs.libre-entreprise.org/"/> - <item name="${project.organization.name}" href="${project.organization.url}"/> - </links> - - <menu name="Utilisateur"> - <item href="/index.html" name="Accueil"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/${projec…" name="Téléchargement"/> - </menu> - - <menu name="Developpeur"> - <item name="Todo" href="Todo.html"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: lutinprocessor/trunk/src/site/site_fr.xml (from rev 177, lutinprocessor/trunk/src/site/site.xml) =================================================================== --- lutinprocessor/trunk/src/site/site_fr.xml (rev 0) +++ lutinprocessor/trunk/src/site/site_fr.xml 2009-02-20 16:03:05 UTC (rev 183) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <publishDate format="dd/MM/yyyy"/> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.3</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="Maven-processor-plugin" href="http://lutinprocessor.labs.libre-entreprise.org/maven-processor-plugin/"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu name="Utilisateur"> + <item href="/index.html" name="Accueil"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/${projec…" name="Téléchargement"/> + </menu> + + <menu name="Developpeur"> + <item name="Todo" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: lutinprocessor/trunk/src/site/site_fr.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native

1 0

[Lutinprocessor-commits] r182 - lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 15:55:13 +0000 (Fri, 20 Feb 2009) New Revision: 182 Modified: lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/I18nExtractorTask.java Log: Improve code style, remove warning Modified: lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/I18nExtractorTask.java =================================================================== --- lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/I18nExtractorTask.java 2009-02-20 15:49:02 UTC (rev 181) +++ lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/I18nExtractorTask.java 2009-02-20 15:55:13 UTC (rev 182) @@ -1,5 +1,5 @@ /* *##% Lutin file processor - * Copyright (C) 2002 - 2008 CodeLutin + * Copyright (C) 2002 - 2009 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 @@ -15,8 +15,21 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/* * - * I18nExtractorTask.java +package org.codelutin.processor.ant; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.codelutin.processor.I18nExtractor; + +/** + * I18nExtractorTask. * * Created: Aug 16, 2004 * @@ -26,49 +39,39 @@ * Last update : $Date$ * by : $Author$ */ +public class I18nExtractorTask extends MatchingTask { + public static final int MSG_VERBOSE = Project.MSG_VERBOSE; -package org.codelutin.processor.ant; + protected File srcDir; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; + protected File destFile; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.codelutin.processor.I18nExtractor; + protected String[] includes = new String[] {}; -public class I18nExtractorTask extends MatchingTask { + protected String[] excludes = new String[] {}; + protected String[] srcFileNames; + public I18nExtractorTask() { + } protected void doExecute() throws BuildException { // creation du repertoire pour le fichier destination destFile.getParentFile().mkdirs(); - ArrayList fileList = new ArrayList(); - for (int i=0; i<srcFileNames.length ; i++) { + List<File> fileList = new ArrayList<File>(); + for (int i = 0; i < srcFileNames.length; i++) { fileList.add(new File(srcFileNames[i])); } try { - new I18nExtractor().extract((File[]) fileList.toArray(new File[0]), destFile); - } catch (IOException eee) { + new I18nExtractor() + .extract(fileList.toArray(new File[0]), destFile); + } catch (IOException eee) { throw new BuildException(eee); } } - static int MSG_VERBOSE = Project.MSG_VERBOSE; - - protected File srcDir; - protected File destFile; - protected String[] includes = new String[] { - }; - protected String[] excludes = new String[] { - }; - protected String[] srcFileNames; - public void setSrcdir(File srcDir) { this.srcDir = srcDir; } @@ -80,22 +83,19 @@ public void execute() throws BuildException { // first of all, make sure that we've got a srcdir if (srcDir == null) { - throw new BuildException( - "srcdir attribute must be set!", - getLocation()); + throw new BuildException("srcdir attribute must be set!", + getLocation()); } if (!srcDir.exists()) { - throw new BuildException( - "srcdir \"" + srcDir.getPath() + "\" does not exist!", - getLocation()); + throw new BuildException("srcdir \"" + srcDir.getPath() + + "\" does not exist!", getLocation()); } if (destFile == null) { - throw new BuildException( - "destFile attribute must be set!", + throw new BuildException("destFile attribute must be set!", getLocation()); } - + // Build the list of files to compute buildFileList(); @@ -109,11 +109,13 @@ DirectoryScanner ds = getDirectoryScanner(srcDir); String[] includes = getIncludes(); - if (includes.length > 0) + if (includes.length > 0) { ds.setIncludes(includes); + } String[] excludes = getExcludes(); - if (excludes.length > 0) + if (excludes.length > 0) { ds.setExcludes(excludes); + } ds.scan(); @@ -122,10 +124,11 @@ } protected boolean isNewer(String filein, String fileout) { - boolean result = - new File(filein).lastModified() > new File(fileout).lastModified(); - if (result) + boolean result = new File(filein).lastModified() > new File(fileout) + .lastModified(); + if (result) { log(filein + " is newer than " + fileout, MSG_VERBOSE); + } return result; } @@ -145,5 +148,4 @@ this.excludes = excludes.split(","); } - }

1 0

[Lutinprocessor-commits] r181 - lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 15:49:02 +0000 (Fri, 20 Feb 2009) New Revision: 181 Modified: lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/ProcessorTask.java Log: Update ant using doc, and class code style Modified: lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/ProcessorTask.java =================================================================== --- lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/ProcessorTask.java 2009-02-20 13:40:21 UTC (rev 180) +++ lutinprocessor/trunk/src/main/java/org/codelutin/processor/ant/ProcessorTask.java 2009-02-20 15:49:02 UTC (rev 181) @@ -1,6 +1,6 @@ /* * *##% Lutin file processor - * Copyright (C) 2002 - 2008 CodeLutin + * Copyright (C) 2002 - 2009 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 @@ -17,18 +17,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/******************************************************************************* - * GeneratorTemplatesTask.java - * - * Created: 14 janv. 2004 - * - * @author Benjamin Poussin <poussin(a)codelutin.com> Copyright Code Lutin - * - * @version $Revision$ - * - * Mise a jour: $Date$ par : $Author$ - */ - package org.codelutin.processor.ant; import java.io.File; @@ -42,41 +30,30 @@ import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; +/** + * Tache ant pour lutinprocessor. + * + * To use this task, put this code in ant build file: + * + * <taskdef name="processor" classname="org.codelutin.processor.ant.ProcessorTask" + * classpath="lib/lutinprocessor.jar" /> + * + * and use it with: + * + * <processor srcdir="${src}" destdir="${targetgen}" filters="org.codelutin.processor.filters.GeneratorTemplatesFilter" /> + * + * Created: 14 janv. 2004 + * + * @author Benjamin Poussin <poussin(a)codelutin.com> Copyright Code Lutin + * + * @version $Revision$ + * + * Mise a jour: $Date$ par : $Author$ + */ public class ProcessorTask extends MatchingTask { // ProcessorTask - public ProcessorTask() { - } + public static final int MSG_VERBOSE = Project.MSG_VERBOSE; - protected String applyTransformationFilename(String filename) { - return filename.replaceAll(fileInPattern, fileOutPattern); - } - - protected void doExecute() throws BuildException { - Processor processor = new Processor(getFilters()); - int numberFiles; - for (numberFiles = 0; numberFiles < files.length; numberFiles++) { - String inputFileName = absoluteSourceName(files[numberFiles]); - String outputFileName = absoluteDestinationName(applyTransformationFilename(files[numberFiles])); - if(verbose) - log("Using " + inputFileName); - if (overwrite || isNewer(inputFileName, outputFileName)) { - if(verbose) - log("Generating " + outputFileName); - // creation du repertoire pour le fichier destination - new File(outputFileName).getParentFile().mkdirs(); - try { - processor.process(new FileReader(inputFileName), - new FileWriter(outputFileName)); - } catch (IOException eee) { - throw new BuildException(eee); - } - } - } - log("Generating " + numberFiles + " files to " + destDir); - } - - static int MSG_VERBOSE = Project.MSG_VERBOSE; - protected File srcDir; protected File destDir; @@ -94,17 +71,21 @@ protected String filters = "org.codelutin.processor.filters.NoActionFilter"; protected boolean overwrite = true; - + protected boolean verbose = false; - - public void setVerbose(boolean v) { - verbose = v; + + public ProcessorTask() { + } - public void setOverwrite(boolean v) { - overwrite = v; + public void setVerbose(boolean verbose) { + this.verbose = verbose; } + public void setOverwrite(boolean overwrite) { + this.overwrite = overwrite; + } + public void setFileOutPattern(String fileOutPattern) { this.fileOutPattern = fileOutPattern; } @@ -125,6 +106,36 @@ this.filters = filters; } + protected String applyTransformationFilename(String filename) { + return filename.replaceAll(fileInPattern, fileOutPattern); + } + + protected void doExecute() throws BuildException { + Processor processor = new Processor(getFilters()); + int numberFiles; + for (numberFiles = 0; numberFiles < files.length; numberFiles++) { + String inputFileName = absoluteSourceName(files[numberFiles]); + String outputFileName = absoluteDestinationName(applyTransformationFilename(files[numberFiles])); + if (verbose) { + log("Using " + inputFileName); + } + if (overwrite || isNewer(inputFileName, outputFileName)) { + if (verbose) { + log("Generating " + outputFileName); + } + // creation du repertoire pour le fichier destination + new File(outputFileName).getParentFile().mkdirs(); + try { + processor.process(new FileReader(inputFileName), + new FileWriter(outputFileName)); + } catch (IOException eee) { + throw new BuildException(eee); + } + } + } + log("Generating " + numberFiles + " files to " + destDir); + } + protected Filter[] getFilters() throws BuildException { String[] filterList = filters.split(","); Filter[] result = new Filter[filterList.length]; @@ -132,7 +143,8 @@ try { // Class.forName semble fonctionner maintenant // avant il fallait utiliser getClass().forName - result[i] = (Filter) Class.forName(filterList[i].trim()).newInstance(); + result[i] = (Filter) Class.forName(filterList[i].trim()) + .newInstance(); } catch (Exception eee) { throw new BuildException("Error during looking for '" + filterList[i].trim() + "' class", eee); @@ -152,8 +164,9 @@ + "\" does not exist!", getLocation()); } - if (destDir == null) + if (destDir == null) { destDir = srcDir; + } if (!destDir.isDirectory()) { throw new BuildException("destination directory \"" + destDir + "\" does not exist or is not a directory", getLocation()); @@ -172,12 +185,14 @@ DirectoryScanner ds = getDirectoryScanner(srcDir); String[] includes = getIncludes(); - if (includes.length > 0) + if (includes.length > 0) { ds.setIncludes(includes); + } String[] excludes = getExcludes(); - if (excludes.length > 0) + if (excludes.length > 0) { ds.setExcludes(excludes); - + } + ds.scan(); // on recherche ceux que l'on doit vraiment refaire @@ -187,8 +202,9 @@ protected boolean isNewer(String filein, String fileout) { boolean result = new File(filein).lastModified() > new File(fileout) .lastModified(); - if (result) + if (result) { log(filein + " is newer than " + fileout, MSG_VERBOSE); + } return result; }

1 0