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

[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

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

20 Feb '09

Author: chatellier Date: 2009-02-20 13:40:21 +0000 (Fri, 20 Feb 2009) New Revision: 180 Modified: maven-processor-plugin/trunk/pom.xml Log: Ant must be included here Modified: maven-processor-plugin/trunk/pom.xml =================================================================== --- maven-processor-plugin/trunk/pom.xml 2009-02-20 13:35:19 UTC (rev 179) +++ maven-processor-plugin/trunk/pom.xml 2009-02-20 13:40:21 UTC (rev 180) @@ -50,7 +50,7 @@ <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.7.1</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> </dependencies> @@ -114,7 +114,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -134,7 +134,7 @@ </plugins> </build> -  +  <reporting> <plugins>  @@ -143,9 +143,8 @@ </plugin> </plugins> </reporting> - - -  + +

1 0

[Lutinprocessor-commits] r179 - maven-processor-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: tchemit Date: 2009-02-20 13:35:19 +0000 (Fri, 20 Feb 2009) New Revision: 179 Modified: maven-processor-plugin/trunk/pom.xml Log: provided ant as lutinprocessor Modified: maven-processor-plugin/trunk/pom.xml =================================================================== --- maven-processor-plugin/trunk/pom.xml 2009-02-20 11:53:15 UTC (rev 178) +++ maven-processor-plugin/trunk/pom.xml 2009-02-20 13:35:19 UTC (rev 179) @@ -46,6 +46,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + <scope>provided</scope> + </dependency> + </dependencies>

1 0

[Lutinprocessor-commits] r178 - lutinprocessor/trunk
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 11:53:15 +0000 (Fri, 20 Feb 2009) New Revision: 178 Modified: lutinprocessor/trunk/pom.xml Log: Use ant to compile, but no provide it. Modified: lutinprocessor/trunk/pom.xml =================================================================== --- lutinprocessor/trunk/pom.xml 2009-02-18 17:20:13 UTC (rev 177) +++ lutinprocessor/trunk/pom.xml 2009-02-20 11:53:15 UTC (rev 178) @@ -21,7 +21,7 @@ <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>1.7.1</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> </dependencies> @@ -58,7 +58,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut>

1 0

[Lutinprocessor-commits] r177 - maven-processor-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 17:20:13 +0000 (Wed, 18 Feb 2009) New Revision: 177 Modified: maven-processor-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven-processor-plugin/trunk/pom.xml =================================================================== --- maven-processor-plugin/trunk/pom.xml 2009-02-18 17:20:10 UTC (rev 176) +++ maven-processor-plugin/trunk/pom.xml 2009-02-18 17:20:13 UTC (rev 177) @@ -14,14 +14,14 @@ </parent> <artifactId>maven-processor-plugin</artifactId> - <version>0.17</version> + <version>0.18-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinprocessor</artifactId> - <version>0.17</version> + <version>0.18-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -144,9 +144,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/tags/0.17</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/tags/0.17</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-processor…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-processor…</url> </scm>

1 0

[Lutinprocessor-commits] r176 - in maven-processor-plugin/tags: . 0.17
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 17:20:10 +0000 (Wed, 18 Feb 2009) New Revision: 176 Added: maven-processor-plugin/tags/0.17/ maven-processor-plugin/tags/0.17/changelog.txt maven-processor-plugin/tags/0.17/pom.xml Removed: maven-processor-plugin/tags/0.17/changelog.txt maven-processor-plugin/tags/0.17/pom.xml Log: [maven-release-plugin] copy for tag 0.17 Copied: maven-processor-plugin/tags/0.17 (from rev 167, maven-processor-plugin/trunk) Deleted: maven-processor-plugin/tags/0.17/changelog.txt =================================================================== --- maven-processor-plugin/trunk/changelog.txt 2009-02-18 15:07:48 UTC (rev 167) +++ maven-processor-plugin/tags/0.17/changelog.txt 2009-02-18 17:20:10 UTC (rev 176) @@ -1,12 +0,0 @@ -ver-0-17 ??? (200902??) - * Parent is org.codelutin:lutinproject:3.4 - * use same version as maven-processor-plugin - -ver-0-16 thimel 20080925 - * Using lutinpluginutil from this plugin dependencies directly - -ver-0-15 thimel 20080922 - * Added changelog - * plugin is now a lutinpluginproject 3.0 - * groupId is org.codelutin - * compatible with maven2 standard structure Copied: maven-processor-plugin/tags/0.17/changelog.txt (from rev 170, maven-processor-plugin/trunk/changelog.txt) =================================================================== --- maven-processor-plugin/tags/0.17/changelog.txt (rev 0) +++ maven-processor-plugin/tags/0.17/changelog.txt 2009-02-18 17:20:10 UTC (rev 176) @@ -0,0 +1,12 @@ +ver-0-17 chemit (20090218) + * Parent is org.codelutin:lutinproject:3.4 + * use same version as maven-processor-plugin + +ver-0-16 thimel 20080925 + * Using lutinpluginutil from this plugin dependencies directly + +ver-0-15 thimel 20080922 + * Added changelog + * plugin is now a lutinpluginproject 3.0 + * groupId is org.codelutin + * compatible with maven2 standard structure Deleted: maven-processor-plugin/tags/0.17/pom.xml =================================================================== --- maven-processor-plugin/trunk/pom.xml 2009-02-18 15:07:48 UTC (rev 167) +++ maven-processor-plugin/tags/0.17/pom.xml 2009-02-18 17:20:10 UTC (rev 176) @@ -1,189 +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.4-SNAPSHOT</version> - </parent> - - <artifactId>maven-processor-plugin</artifactId> - <version>0.17-SNAPSHOT</version> - - <dependencies> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinprocessor</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>${lutinpluginutil.version}</version> - <scope>compile</scope> - </dependency> - - </dependencies> - -  -  -  - <name>Plugin maven Lutin Processor</name> - <inceptionYear>2006</inceptionYear> - -  - <contributors> - <contributor> - <name>Julien Ruchaud</name> - <email>ruchaud(a)codelutin.com</email> - <organization>Code Lutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - </contributors> - -  -  -  - - <packaging>maven-plugin</packaging> - - <properties> -  - <labs.id>28</labs.id> - -  - <labs.project>lutinprocessor</labs.project> - - <lutinpluginutil.version>0.2</lutinpluginutil.version> - </properties> - - <build> - <defaultGoal>install</defaultGoal> - - <plugins> - -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.build.sourceEncoding}</outputEncoding> - </configuration> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -  - <reporting> - <plugins> -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - -  -  -  - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -  - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - - <profiles> -  - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: maven-processor-plugin/tags/0.17/pom.xml (from rev 175, maven-processor-plugin/trunk/pom.xml) =================================================================== --- maven-processor-plugin/tags/0.17/pom.xml (rev 0) +++ maven-processor-plugin/tags/0.17/pom.xml 2009-02-18 17:20:10 UTC (rev 176) @@ -0,0 +1,204 @@ +<?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.4</version> + </parent> + + <artifactId>maven-processor-plugin</artifactId> + <version>0.17</version> + + <dependencies> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinprocessor</artifactId> + <version>0.17</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>${lutinpluginutil.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Plugin maven Lutin Processor</name> + <inceptionYear>2006</inceptionYear> + +  + <contributors> + <contributor> + <name>Julien Ruchaud</name> + <email>ruchaud(a)codelutin.com</email> + <organization>Code Lutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + </contributors> + +  +  +  + + <packaging>maven-plugin</packaging> + + <properties> +  + <labs.id>28</labs.id> + +  + <labs.project>lutinprocessor</labs.project> + + <lutinpluginutil.version>0.3</lutinpluginutil.version> + + <maven.version>2.0.9</maven.version> + </properties> + + <build> + <defaultGoal>install</defaultGoal> + + <plugins> + +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>0.8.3</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  + <reporting> + <plugins> +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> + </reporting> + + +  +  +  + +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/tags/0.17</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinprocessor/maven-processor-plugin/tags/0.17</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-processor…</url> + </scm> + +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + + <profiles> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.5</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project>

1 0