- Maven-helper-plugin-commits - mailman.cloud.codelutin.com

r744 - trunk
by tchemit＠users.nuiton.org June 30, 2010

June 30, 2010

Author: tchemit Date: 2010-07-01 01:27:06 +0200 (Thu, 01 Jul 2010) New Revision: 744 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/744 Log: prepare use of mavenpom 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-30 23:19:30 UTC (rev 743) +++ trunk/pom.xml 2010-06-30 23:27:06 UTC (rev 744) @@ -326,6 +326,16 @@  <siteSourcesType>apt</siteSourcesType> + +  +  + +  + <arguments>-DperformRelease -Dcentral-safe</arguments> + +  + <releaseProfiles>central-safe</releaseProfiles> + </properties> <build> @@ -531,6 +541,7 @@ </build> </profile> +  <profile> <id>central-safe</id> <activation>

1 0

r743 - trunk/src/main/java/org/nuiton/helper/plugin
by tchemit＠users.nuiton.org June 30, 2010

June 30, 2010

Author: tchemit Date: 2010-07-01 01:19:30 +0200 (Thu, 01 Jul 2010) New Revision: 743 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/743 Log: improve logs Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-30 09:08:04 UTC (rev 742) +++ trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-30 23:19:30 UTC (rev 743) @@ -47,6 +47,7 @@ import org.apache.maven.wagon.repository.Repository; import org.codehaus.plexus.util.StringUtils; import org.nuiton.plugin.AbstractPlugin; +import org.nuiton.plugin.PluginHelper; import java.util.ArrayList; import java.util.List; @@ -338,7 +339,7 @@ // no more artifacts to check continue; } - + long t0 = System.nanoTime(); String url = repository.getUrl(); List<String> ids = getRepositoryCache(url); @@ -348,11 +349,12 @@ log.info("Use repository " + url); } List<Artifact> found = checkDependency(repository, wagon, ids); + long delay = System.nanoTime() - t0; String message; if (found.isEmpty()) { message = "No artifact resolved by the repository " + url; } else { - message = String.format("%1$4s artifact(s) resolved by repository %2$s", found.size(), url); + message = String.format("%1$4s artifact(s) resolved by repository %2$s in %3$s", found.size(), url, PluginHelper.convertTime(delay)); } log.info(message); artifacts.removeAll(found);

1 0

r742 - trunk/src/main/java/org/nuiton/plugin
by tchemit＠users.nuiton.org June 30, 2010

June 30, 2010

Author: tchemit Date: 2010-06-30 11:08:04 +0200 (Wed, 30 Jun 2010) New Revision: 742 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/742 Log: fix encoding Modified: trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java Modified: trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2010-06-30 09:07:09 UTC (rev 741) +++ trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2010-06-30 09:08:04 UTC (rev 742) @@ -865,6 +865,11 @@ protected void checkEncoding() { if (PluginWithEncoding.class.isAssignableFrom(getClass())) { + + if (isVerbose()) { + getLog().info("Will check encoding : " + + ((PluginWithEncoding) this).getEncoding()); + } PluginHelper.checkEncoding((PluginWithEncoding) this); } }

1 0

r741 - trunk/src/main/java/org/nuiton/plugin
by tchemit＠users.nuiton.org June 30, 2010

June 30, 2010

Author: tchemit Date: 2010-06-30 11:07:09 +0200 (Wed, 30 Jun 2010) New Revision: 741 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/741 Log: fix encoding Modified: trunk/src/main/java/org/nuiton/plugin/PluginHelper.java Modified: trunk/src/main/java/org/nuiton/plugin/PluginHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2010-06-29 22:40:51 UTC (rev 740) +++ trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2010-06-30 09:07:09 UTC (rev 741) @@ -675,7 +675,7 @@ mojo.getLog().warn( "File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING + ", i.e. build is platform dependent!"); + mojo.setEncoding(ReaderFactory.FILE_ENCODING); } - mojo.setEncoding(ReaderFactory.FILE_ENCODING); } }

1 0

r740 - trunk/src/main/java/org/nuiton/helper/plugin
by tchemit＠users.nuiton.org June 29, 2010

June 29, 2010

Author: tchemit Date: 2010-06-30 00:40:51 +0200 (Wed, 30 Jun 2010) New Revision: 740 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/740 Log: add log Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-29 21:41:39 UTC (rev 739) +++ trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-29 22:40:51 UTC (rev 740) @@ -403,6 +403,9 @@ repositoryLayout, true); getLog().info("Will use repository " + repo.getUrl()); + if (verbose) { + getLog().info(repo.toString()); + } safeRepositories.add(repo); } return safeRepositories;

1 0

r739 - trunk/src/main/java/org/nuiton/helper/plugin
by tchemit＠users.nuiton.org June 29, 2010

June 29, 2010

Author: tchemit Date: 2010-06-29 23:41:39 +0200 (Tue, 29 Jun 2010) New Revision: 739 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/739 Log: Evolution #748: Add runOnce property on mojo check-auto-container Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-29 21:23:08 UTC (rev 738) +++ trunk/src/main/java/org/nuiton/helper/plugin/CheckAutoContainerPlugin.java 2010-06-29 21:41:39 UTC (rev 739) @@ -103,6 +103,17 @@ protected boolean verbose; /** + * A flag to execute only once the mojo. + * + * Note: By default, value is {@code true} since it is not necessary + * to check twice for a same artifact. + * + * @parameter expression="${helper.runOnce}" default-value="true" + * @since 1.2.6 + */ + protected boolean runOnce; + + /** * Project. * * @parameter default-value="${project}" @@ -207,6 +218,8 @@ public static final String MAVEN_CENTRAL_URL = "http://repo1.maven.org/maven2/"; + private boolean wasAlreadyExecuted; + @Override public MavenProject getProject() { return project; @@ -238,6 +251,16 @@ setVerbose(true); } + if (runOnce) { + + boolean wasAlreadyExecuted = checkAlreadyExecuted(); + + if (wasAlreadyExecuted) { + return; + } + + } + safeRepositories = createSafeRepositories(); artifacts = prepareArtifacts(); @@ -250,9 +273,45 @@ } } + protected boolean checkAlreadyExecuted() { + // compute the unique key refering to parameters of plugin + + StringBuilder buffer = new StringBuilder("check-auto-container##"); + Artifact artifact = project.getArtifact(); + buffer.append(artifact.getGroupId()).append(":"); + buffer.append(artifact.getArtifactId()).append(":"); + buffer.append(artifact.getVersion()).append("##"); + + // check if plugin was already done. + + String key = buffer.toString(); + + if (verbose) { + getLog().info("check if already done for key : " + key); + } + Object value = project.getProperties().get(key); + if (value != null) { + // ok was already done + wasAlreadyExecuted = true; + } + long timestamp = System.nanoTime(); + project.getProperties().put(key, timestamp + ""); + if (verbose) { + getLog().info("Adding cache key " + key + + " with timestamp " + timestamp); + } + return wasAlreadyExecuted; + } + @Override protected boolean checkSkip() { + if (runOnce && wasAlreadyExecuted) { + // ok was already done + getLog().info("Goal was already executed, will skip goal."); + return false; + } + if (artifacts.isEmpty()) { getLog().info("Project has no dependecy."); return false;

1 0

r738 - trunk/src/site/apt
by tchemit＠users.nuiton.org June 29, 2010

June 29, 2010

Author: tchemit Date: 2010-06-29 23:23:08 +0200 (Tue, 29 Jun 2010) New Revision: 738 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/738 Log: update doc Modified: trunk/src/site/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-06-29 21:04:59 UTC (rev 737) +++ trunk/src/site/apt/index.apt 2010-06-29 21:23:08 UTC (rev 738) @@ -52,7 +52,7 @@ it. When mojo will be init, it will check sanity of encoding and if no encoding - was specified, it will use the system one. + was specified, it will use the system one defined by system property <<file.encoding>>. Plugin overview

1 0

r737 - trunk/src/site/apt
by tchemit＠users.nuiton.org June 29, 2010

June 29, 2010

Author: tchemit Date: 2010-06-29 23:04:59 +0200 (Tue, 29 Jun 2010) New Revision: 737 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/737 Log: update doc Modified: trunk/src/site/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-06-29 10:50:18 UTC (rev 736) +++ trunk/src/site/apt/index.apt 2010-06-29 21:04:59 UTC (rev 737) @@ -36,12 +36,25 @@ There is three ways of using this toolbox : - * The plugin way : the project offers some plugins (see Plugin overview) + * The plugin way : the project offers some plugins (see {Plugin overview}) - * The plugin toolkit : a very small framework to create new plugins (see Plugin toolkit overview) + * The plugin toolkit : a very small framework to create new plugins (see {Plugin toolkit overview}) - * The test toolkit : usefull classes to make new tests (see Test toolkit overview) + * The test toolkit : usefull classes to make new tests (see {Test toolkit overview}) +What's new in version 1.2.6 + + Version 1.2.6 introduce a new api for mojo dealing with encoding. + + The new contract is <<org.nuiton.plugin.PluginWithEncoding>>. + + To use it, just add an implements for your mojo on this contract and implements + it. + + When mojo will be init, it will check sanity of encoding and if no encoding + was specified, it will use the system one. + + Plugin overview The plugin has the following goals:

1 0

r736 - trunk
by tchemit＠users.nuiton.org June 29, 2010

June 29, 2010

Author: tchemit Date: 2010-06-29 12:50:18 +0200 (Tue, 29 Jun 2010) New Revision: 736 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/736 Log: stay on mavenpom 2.2.1 to make release of mavenpom 2.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-29 10:49:29 UTC (rev 735) +++ trunk/pom.xml 2010-06-29 10:50:18 UTC (rev 736) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.2.1</version> </parent> <artifactId>maven-helper-plugin</artifactId>

1 0

r735 - in trunk: . src/main/java/org/nuiton/helper/plugin src/main/java/org/nuiton/plugin
by tchemit＠users.nuiton.org June 29, 2010

June 29, 2010

Author: tchemit Date: 2010-06-29 12:49:29 +0200 (Tue, 29 Jun 2010) New Revision: 735 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/735 Log: Evolution #722: Introduce PluginWithEncoding Added: trunk/src/main/java/org/nuiton/plugin/PluginWithEncoding.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java trunk/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java trunk/src/main/java/org/nuiton/plugin/PluginHelper.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-27 06:49:24 UTC (rev 734) +++ trunk/pom.xml 2010-06-29 10:49:29 UTC (rev 735) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <artifactId>maven-helper-plugin</artifactId> Modified: trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java 2010-06-27 06:49:24 UTC (rev 734) +++ trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java 2010-06-29 10:49:29 UTC (rev 735) @@ -33,6 +33,7 @@ import org.apache.maven.project.MavenProject; import org.nuiton.plugin.AbstractPlugin; import org.nuiton.plugin.PluginHelper; +import org.nuiton.plugin.PluginWithEncoding; import java.io.File; import java.io.IOException; @@ -49,7 +50,7 @@ * @requiresProject true * @since 1.1.0 */ -public class CollectFilesMojo extends AbstractPlugin { +public class CollectFilesMojo extends AbstractPlugin implements PluginWithEncoding { /** * The projects in the reactor. @@ -58,7 +59,7 @@ * @readonly * @since 1.2.4 */ - protected List reactorProjects; + protected List<?> reactorProjects; /** * Fallback maven project (for maven 2). @@ -78,7 +79,7 @@ * @readonly * @since 1.0.0 */ - protected List attachedArtifacts; + protected List<?> attachedArtifacts; /** * The local repository. @@ -359,6 +360,7 @@ /** * Read a file containing on each line the path of a file. * + * @param input the file where to pick files (one file per line). * @return the list of files read from the given file * @throws IOException if any pb while reading file */ @@ -491,24 +493,6 @@ return result; } -// -// protected MavenProject getExecutionRootProject(MavenProject project) { -// -// if (project.isExecutionRoot()) { -// -// getLog().info("Project is root execution : " + project); -// return project; -// } -// -// if (project.getParent() == null) { -// -// getLog().info("Could not find executionRoot for " + project); -// return null; -// } -// -// MavenProject result = getExecutionRootProject(project.getParent()); -// return result; -// } protected void addFile(File f, String msg, @@ -566,5 +550,15 @@ public void setVerbose(boolean verbose) { this.verbose = verbose; } + + @Override + public String getEncoding() { + return encoding; + } + + @Override + public void setEncoding(String encoding) { + this.encoding = encoding; + } } Modified: trunk/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java 2010-06-27 06:49:24 UTC (rev 734) +++ trunk/src/main/java/org/nuiton/helper/plugin/SendEmailMojo.java 2010-06-29 10:49:29 UTC (rev 735) @@ -37,6 +37,7 @@ import org.nuiton.io.mail.ProjectJavamailMailSender; import org.nuiton.plugin.AbstractPlugin; import org.nuiton.plugin.PluginHelper; +import org.nuiton.plugin.PluginWithEncoding; import java.io.File; import java.util.List; @@ -50,7 +51,7 @@ * @requiresProject true * @since 1.0.3 */ -public class SendEmailMojo extends AbstractPlugin { +public class SendEmailMojo extends AbstractPlugin implements PluginWithEncoding{ /** * Dependance du projet. @@ -304,7 +305,6 @@ "Invalid mail sender: name and email is mandatory (" + mailSender + ")."); } - } @Override @@ -399,7 +399,7 @@ ProjectJavamailMailSender mailer = new ProjectJavamailMailSender(); ConsoleLogger logger = new ConsoleLogger(Logger.LEVEL_INFO, "base"); - if (getLog().isDebugEnabled()) { + if (isVerbose()) { logger.setThreshold(Logger.LEVEL_DEBUG); } mailer.enableLogging(logger); @@ -432,4 +432,14 @@ protected boolean isExecutionRoot() { return project.isExecutionRoot(); } + + @Override + public String getEncoding() { + return encoding; + } + + @Override + public void setEncoding(String encoding) { + this.encoding = encoding; + } } Modified: trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2010-06-27 06:49:24 UTC (rev 734) +++ trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2010-06-29 10:49:29 UTC (rev 735) @@ -81,8 +81,7 @@ protected abstract void doAction() throws Exception; @Override - public final void execute() throws MojoExecutionException, - MojoFailureException { + public final void execute() throws MojoExecutionException, MojoFailureException { try { if (getLog().isDebugEnabled()) { @@ -103,8 +102,14 @@ try { + checkEncoding(); + init(); + } catch (MojoFailureException e) { + throw e; + } catch (MojoExecutionException e) { + throw e; } catch (Exception e) { throw new MojoExecutionException( "could not init goal " + getClass().getSimpleName() + @@ -127,6 +132,10 @@ doAction(); + } catch (MojoFailureException e) { + throw e; + } catch (MojoExecutionException e) { + throw e; } catch (Exception e) { throw new MojoExecutionException( "could not execute goal " + getClass().getSimpleName() + @@ -795,7 +804,7 @@ * the resources */ protected URL getTemplate(File f) throws IOException { - URL r = null; + URL r; if (f.exists()) { r = f.toURI().toURL(); } else { @@ -829,7 +838,7 @@ } } - protected MavenProject getRootProject(MavenProject project, List reactors) { + protected MavenProject getRootProject(MavenProject project, List<?> reactors) { if (project.isExecutionRoot() || reactors.size() == 1 || reactors.get(0).equals(project)) { getLog().debug("project " + project + " is root execution :)"); @@ -841,4 +850,30 @@ getLog().debug("first project in reactor : " + root); return root; } + + /** + * Method to be invoked in init phase to check sanity of {@link PluginWithEncoding#getEncoding()}. + * + * If no encoding was filled, then use the default for system + * (via {@code file.encoding} environement property). + * + * Note: If mojo is not implementing {@link PluginWithEncoding}, + * nothing is done. + * + * @since 1.26 + */ + protected void checkEncoding() { + + if (PluginWithEncoding.class.isAssignableFrom(getClass())) { + PluginHelper.checkEncoding((PluginWithEncoding) this); + } + } + + /** + * @return {@code true} if project is not a pom, {@code false} otherwise. + * @since 1.2.6 + */ + protected boolean hasClassPath() { + return rejectPackaging(Packaging.pom); + } } Modified: trunk/src/main/java/org/nuiton/plugin/PluginHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2010-06-27 06:49:24 UTC (rev 734) +++ trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2010-06-29 10:49:29 UTC (rev 735) @@ -30,13 +30,30 @@ import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.ReaderFactory; +import org.codehaus.plexus.util.StringUtils; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.StringReader; import java.net.MalformedURLException; import java.net.URL; import java.text.MessageFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.SortedSet; +import java.util.TreeSet; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -639,4 +656,26 @@ "could not obtain url " + url, ex); } } + + /** + * Method to be invoked in init phase to check sanity of {@link PluginWithEncoding#getEncoding()}. + * + * If no encoding was filled, then use the default for system + * (via {@code file.encoding} environement property). + * + * Note: If mojo is not implementing {@link PluginWithEncoding}, + * nothing is done. + * + * @param mojo the mojo to check. + * @since 1.2.6 + */ + public static void checkEncoding(PluginWithEncoding mojo) { + + if (StringUtils.isEmpty(mojo.getEncoding())) { + mojo.getLog().warn( + "File encoding has not been set, using platform encoding " + ReaderFactory.FILE_ENCODING + + ", i.e. build is platform dependent!"); + } + mojo.setEncoding(ReaderFactory.FILE_ENCODING); + } } Added: trunk/src/main/java/org/nuiton/plugin/PluginWithEncoding.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/PluginWithEncoding.java (rev 0) +++ trunk/src/main/java/org/nuiton/plugin/PluginWithEncoding.java 2010-06-29 10:49:29 UTC (rev 735) @@ -0,0 +1,52 @@ +/* + * #%L + * Maven helper plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.plugin; + +/** + * A common contract to be implements by our mojo and reports which needs encoding. + * + * Just expose a getter-setter {@link #getEncoding()} and {@link #setEncoding(String)}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public interface PluginWithEncoding extends Plugin { + + + /** + * Gets the encoding to be used to read and write io resources. + * + * @return the encoding used. + */ + String getEncoding(); + + /** + * Sets the encoding to use in mojo. + * + * @param encoding the new encoding to use in mojo + */ + void setEncoding(String encoding); +} \ No newline at end of file Property changes on: trunk/src/main/java/org/nuiton/plugin/PluginWithEncoding.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0