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

r614 - trunk/src/main/java/org/nuiton/plugin
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 15:10:17 +0200 (Sun, 11 Oct 2009) New Revision: 614 Modified: trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java Log: add todo Modified: trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java 2009-10-10 16:16:12 UTC (rev 613) +++ trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java 2009-10-11 13:10:17 UTC (rev 614) @@ -54,11 +54,12 @@ * @author chemit * @since 1.3 * + * TODO TC-20091011 should use plexus velocity component */ public class VelocityTemplateGenerator { protected VelocityEngine engine; - protected final MavenProject mavenProject; + protected MavenProject mavenProject; protected Template velocityTemplate; public VelocityTemplateGenerator(MavenProject mavenProject, URL template) throws URISyntaxException {

1 0

r613 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 18:16:12 +0200 (Sat, 10 Oct 2009) New Revision: 613 Modified: trunk/pom.xml Log: add license plugin (replace helper plugin for add-license and add-third-party goals) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 16:09:08 UTC (rev 612) +++ trunk/pom.xml 2009-10-10 16:16:12 UTC (rev 613) @@ -327,6 +327,7 @@ <properties> + <license.version>2.0.0</license.version> <maven.version>2.2.1</maven.version> <plexusMailSender.version>1.0-alpha-2</plexusMailSender.version> <javadoc.version>2.6</javadoc.version> @@ -628,6 +629,12 @@ <artifactId>maven-invoker-plugin</artifactId> <version>1.3</version> </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>${license.version}</version> + </plugin> </plugins> </pluginManagement> @@ -936,6 +943,21 @@ </executions> </plugin> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>add-license</goal> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </profile>

1 0

r612 - in trunk: . src/main/java/org/nuiton src/main/resources/META-INF src/site src/site/apt src/test/java/org/nuiton src/test/java/org/nuiton/io src/test/resources/org/nuiton
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 18:09:08 +0200 (Sat, 10 Oct 2009) New Revision: 612 Removed: trunk/src/main/java/org/nuiton/AbstractPlugin.java trunk/src/main/java/org/nuiton/license/ trunk/src/main/java/org/nuiton/util/ trunk/src/main/resources/META-INF/licenses/ trunk/src/test/java/org/nuiton/license/ trunk/src/test/java/org/nuiton/util/ trunk/src/test/resources/org/nuiton/license/ trunk/src/test/resources/org/nuiton/util/ Modified: trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/site.xml trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java Log: - Evolution #65: reorganisation des packages - Evolution #86: D?\195?\169placement du paquetage license vers maven-license-plugin Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 13:18:58 UTC (rev 611) +++ trunk/pom.xml 2009-10-10 16:09:08 UTC (rev 612) @@ -378,32 +378,7 @@ </executions> </plugin> -  <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>copy-licenses</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="target/site" /> - <copy todir="target/site" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${maven.src.dir}/main/resources/META-INF"> - <include name="licenses/**" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <artifactId>maven-jar-plugin</artifactId> <executions> <execution> Deleted: trunk/src/main/java/org/nuiton/AbstractPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/AbstractPlugin.java 2009-10-10 13:18:58 UTC (rev 611) +++ trunk/src/main/java/org/nuiton/AbstractPlugin.java 2009-10-10 16:09:08 UTC (rev 612) @@ -1,441 +0,0 @@ -/* - * *##% - * Maven helper plugin - * Copyright (C) 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 - * 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>. - * ##%* - */ -package org.nuiton; - -import java.io.ByteArrayInputStream; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.model.Resource; -import org.codehaus.plexus.util.DirectoryScanner; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.io.RawInputStreamFacade; -import org.nuiton.plugin.Plugin; -import org.nuiton.util.MirroredFileUpdater; -import org.nuiton.util.PluginHelper; - -/** - * Un MOJO de base pour les autres MOJO concrets avec les options communes. - * - * @author chemit - * @deprecated since 1.0.3, prefer use {@link org.nuiton.plugin.AbstractPlugin} - */ -@Deprecated -public abstract class AbstractPlugin extends AbstractMojo implements Plugin { - - protected abstract boolean ensurePackaging(); - - /** - * la methode qui est lancee au debut de la methode {@link #execute()} pour preparer l'init du goal. - * - * @return <code>true</code> if there is something to generate, <code>false</code> otherwise. - * @throws Exception if any - */ - protected abstract boolean init() throws Exception; - - /** - * Do plugin action. - * <p/> - * The method {@link #execute()} invoke this method only and only if : - * <ul> - * <li>{@link #ensurePackaging()} returns <code>false</code> (filtrer project type, for example).</li> - * <li>method {@link #init()} returns <code>true</code>.</li> - * </ul> - * - * @throws Exception if any - */ - protected abstract void doAction() throws Exception; - protected final String skipAfterInitMessage; - - protected AbstractPlugin(String skipAfterInitMessage) { - this.skipAfterInitMessage = skipAfterInitMessage; - } - - @Override - public void execute() throws MojoExecutionException, MojoFailureException { - try { - - if (ensurePackaging()) { - getLog().info("skip goal for packaging " + getProject().getPackaging()); - return; - } - - boolean canContinue = init(); - - if (!canContinue) { - getLog().info(skipAfterInitMessage); - return; - } - - doAction(); - - } catch (Exception e) { - throw new MojoExecutionException("could not init goal " + getClass().getSimpleName() + " for reason : " + e.getMessage(), e); - } - } - - /** - * Does the actual copy of the file and logging. - * - * @param srcFile represents the file to copy. - * @param destFile file name of destination file. - * - * @throws MojoExecutionException with a message if an - * error occurs. - */ - protected void copyFile(File srcFile, File destFile) - throws MojoExecutionException { - try { - getLog().info("Copying " + srcFile.getName() + " to " + destFile); - - FileUtils.copyFile(srcFile, destFile); - - } catch (Exception e) { - throw new MojoExecutionException("Error copying from " + srcFile + " to " + destFile, e); - } - } - - /** - * Does the actual copy of the content to a fileand logging. - * - * @param content represents the content to writeFile into file. - * @param destFile file name of destination file. - * @param encoding encoding to use to writeFile file - * @throws MojoExecutionException with a message if an - * error occurs. - */ - protected void copyFile(String content, File destFile, String encoding) - throws MojoExecutionException { - try { - getLog().info("Copying content to " + destFile); - - InputStream in = new ByteArrayInputStream(content.getBytes(encoding)); - RawInputStreamFacade facade = new RawInputStreamFacade(in); - - FileUtils.copyStreamToFile(facade, destFile); - - } catch (Exception e) { - throw new MojoExecutionException("Error copying content to " + destFile, e); - } - } - - public void writeFile(File destFile, String content, String encoding) throws IOException { - PluginHelper.write(destFile, content, encoding); - } - - /** - * Test if a file exists and is newer than the pom file. - * - * @param f the file to test - * @return <code>true</code> if file exists and is newer than the pom file, - * <code>false</code> otherwise. - */ - protected boolean isFileNewerThanPomFile(File f) { - File pomFile = getProject().getFile(); - return f.exists() && f.lastModified() > pomFile.lastModified(); - } - - protected void getFilesToTreateForRoots(String[] includes, String[] excludes, List<String> roots, Map<File, String[]> files, MirroredFileUpdater updater) { - - DirectoryScanner ds = new DirectoryScanner(); - ds.setIncludes(includes); - if (excludes != null) { - ds.setExcludes(excludes); - - } - for (String src : roots) { - - File f = new File(src); - if (!f.exists()) { - // do nothing on a non-existent - continue; - } - - if (isVerbose()) { - getLog().info("discovering java source files in root " + src); - } - - ds.setBasedir(f); - // scan - ds.scan(); - - // get files - String[] tmp = ds.getIncludedFiles(); - - if (tmp.length < 1) { - // no files found - continue; - } - - List<String> toTreate = new ArrayList<String>(); - - if (updater != null) { - updater.setSourceDirectory(f); - } - - - for (String filePath : tmp) { - File srcFile = new File(f, filePath); - // check file is up-to-date - if (updater == null || !updater.isFileUpToDate(srcFile)) { - toTreate.add(filePath); - } - } - - - if (toTreate.isEmpty()) { - // no file or all are up-to-date - continue; - } - - // register files - files.put(f, toTreate.toArray(new String[toTreate.size()])); - - } - } - - protected Map<String, String> getFilesToTreate(String[] includes, String[] excludes, File srcDir, MirroredFileUpdater updater) { - - Map<String, String> result = new java.util.TreeMap<String, String>(); - - DirectoryScanner ds = new DirectoryScanner(); - ds.setIncludes(includes); - if (excludes != null) { - ds.setExcludes(excludes); - - } - - if (!srcDir.exists()) { - // do nothing on a non-existent - return result; - } - - if (isVerbose()) { - getLog().info("discovering files for " + srcDir); - } - - ds.setBasedir(srcDir); - // scan - ds.scan(); - - // get files - String[] tmp = ds.getIncludedFiles(); - - if (tmp.length < 1) { - // no files found - return result; - } - - List<String> toTreate = new ArrayList<String>(); - - if (updater != null) { - updater.setSourceDirectory(srcDir); - } - - for (String filePath : tmp) { - File srcFile = new File(srcDir, filePath); - File mirrorFile = updater.getMirrorFile(srcFile); - // check file is up-to-date - if (updater == null || !updater.isFileUpToDate(srcFile)) { - result.put(filePath, mirrorFile.getAbsolutePath()); - toTreate.add(filePath); - } - } - - - if (toTreate.isEmpty()) { - // no file or all are up-to-date - return result; - } - - // register files - return result; - } - - protected void addCompileSourceRoots(File srcDir) { - if (!getProject().getCompileSourceRoots().contains(srcDir.getPath())) { - if (isVerbose()) { - getLog().info("adding source roots : " + srcDir.getPath()); - } - getProject().addCompileSourceRoot(srcDir.getPath()); - } - } - - protected void removeCompileSourceRoots(File srcDir) { - if (getProject().getCompileSourceRoots().contains(srcDir.getPath())) { - if (isVerbose()) { - getLog().info("removing source roots : " + srcDir.getPath()); - } - getProject().getCompileSourceRoots().remove(srcDir.getPath()); - } - } - - protected void addTestCompileSourceRoots(File srcDir) { - if (!getProject().getTestCompileSourceRoots().contains(srcDir.getPath())) { - if (isVerbose()) { - getLog().info("adding test source roots : " + srcDir.getPath()); - } - getProject().addTestCompileSourceRoot(srcDir.getPath()); - } - } - - protected void removeTestCompileSourceRoots(File srcDir) { - if (getProject().getTestCompileSourceRoots().contains(srcDir.getPath())) { - if (isVerbose()) { - getLog().info("removing test source roots : " + srcDir.getPath()); - } - getProject().getTestCompileSourceRoots().remove(srcDir.getPath()); - } - } - - protected void addResourceDir(String dir) { - boolean added = PluginHelper.addResourceDir(dir, getProject()); - if (added) { - getLog().info("add resource " + dir); - } - } - - protected void addTestResourceDir(String dir) { - boolean added = PluginHelper.addTestResourceDir(dir, getProject()); - if (added) { - getLog().info("add test resource " + dir); - } - } - - @SuppressWarnings({"unchecked"}) - protected URLClassLoader initClassLoader(MavenProject project, File src, boolean addSourcesToClassPath, boolean testPhase, boolean addResourcesToClassPath, boolean addCompileClassPath, boolean addProjectClassPath) throws MalformedURLException { - URLClassLoader loader = null; - if (project != null) { - - URLClassLoader result; - try { - - List<URL> lUrls = new ArrayList<URL>(); - List<String> sources = project.getCompileSourceRoots(); - - if (addSourcesToClassPath) { - for (String source : sources) { - lUrls.add(new File(source).toURI().toURL()); - } - if (testPhase) { - for (Object source : project.getTestCompileSourceRoots()) { - lUrls.add(new File(source.toString()).toURI().toURL()); - } - } - } - if (addResourcesToClassPath) { - for (Object source : project.getResources()) { - Resource r = (Resource) source; - lUrls.add(new File(r.getDirectory()).toURI().toURL()); - } - } - if (testPhase && addCompileClassPath) { - if (project != null) { - lUrls.add(new File(project.getBuild().getOutputDirectory()).toURI().toURL()); - } - } - if (src != null) { - lUrls.add(src.toURI().toURL()); - } - if (addProjectClassPath) { - getLog().info("use project compile scope class-path"); - // add also all dependencies of the project in compile scope - Set<?> artifacts = project.getArtifacts(); - for (Object o : artifacts) { - Artifact a = (Artifact) o; - lUrls.add(a.getFile().toURI().toURL()); - } - } - - result = new URLClassLoader(lUrls.toArray(new URL[lUrls.size()]), getClass().getClassLoader()); - - } catch (IOException e) { - throw new RuntimeException("Can't create ClassLoader for reason " + e.getMessage(), e); - } - loader = result; - } else { - List<URL> lUrls = new ArrayList<URL>(); - if (addSourcesToClassPath) { - lUrls.add(src.toURI().toURL()); - } - loader = new URLClassLoader(lUrls.toArray(new URL[lUrls.size()]), getClass().getClassLoader()); - } - if (isVerbose()) { - for (URL entry : loader.getURLs()) { - getLog().info("classpath : " + entry); - } - } - return loader; - } - - /** - * - * @param f le fichier de template - * @return l'url du fichier demande - * @throws IOException pour toute erreur de recherche - */ - protected URL getTemplate(File f) throws IOException { - URL r = null; - if (f.exists()) { - r = f.toURI().toURL(); - } else { - r = getClass().getResource(f.toString()); - } - return r; - } - - /** - * Vérifie que le fichier donné existe bien (sur le filesystem ou - * dans le class-path). - * - * @param f le fichier que l'on veut vérifié - * @throws IOException pour tout erreur de recherche - */ - protected void checkResource(File f) throws IOException { - if (!f.exists()) { - // test in classPath - InputStream r = null; - try { - r = getClass().getResourceAsStream(f.toString()); - if (r == null) { - throw new IOException("could not find ressource " + f); - } - } finally { - if (r != null) { - r.close(); - } - } - } - } -} Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2009-10-10 13:18:58 UTC (rev 611) +++ trunk/src/site/apt/index.apt 2009-10-10 16:09:08 UTC (rev 612) @@ -21,20 +21,14 @@ The plugin has the following goals: - * {{{share-server-secret-mojo.html} helper:share-server-secret}} to expose a server secret data in project. - - * {{{send-email-mojo.html} helper:send-email}} to send a email. - * {{{collect-files-mojo.html} helper:collect-files}} to collect some files over a project. * {{{help-mojo.html} helper:help}} display help about the plugin (goals, usage). - * {{{add-license-mojo.html} helper:add-license}} <DEPRECATED> add license file and third-party files to classpath (generate them if necessary). + * {{{send-email-mojo.html} helper:send-email}} to send a email. - * {{{add-third-party-mojo.html} helper:add-third-party}} <DEPRECATED> write the licenses of all third-party libraries used in project. + * {{{share-server-secret-mojo.html} helper:share-server-secret}} to expose a server secret data in project. - * {{{available-licenses-mojo.html} helper:available-licenses}} <DEPRECATED> display the known licenses of the plugin. - Consult the {{{mojo-usages.html}usages}} page to have more details of mojos. Consult the {{{mojo-examples.html}examples}} page to have some examples of mojos. Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-10-10 13:18:58 UTC (rev 611) +++ trunk/src/site/site.xml 2009-10-10 16:09:08 UTC (rev 612) @@ -44,9 +44,6 @@ <item name="share-server-secret" href="share-server-secret-mojo.html"/> <item name="send-email" href="send-email-mojo.html"/> <item name="help" href="help-mojo.html"/> - <item name="add-license" href="add-license-mojo.html"/> - <item name="add-third-party" href="add-third-party-mojo.html"/> - <item name="available-licenses" href="available-licenses-mojo.html"/> </item> <item name="Mojo usages" href="mojo-usages.html"/> <item name="Mojo examples" href="mojo-examples.html"/> Modified: trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java =================================================================== --- trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java 2009-10-10 13:18:58 UTC (rev 611) +++ trunk/src/test/java/org/nuiton/io/JaxxFileUpdaterTest.java 2009-10-10 16:09:08 UTC (rev 612) @@ -23,11 +23,12 @@ import java.io.File; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.io.FileUpdaterHelper.JaxxFileUpdater; import org.nuiton.plugin.TestHelper; import static org.junit.Assert.*; /** - * Test of a {@link org.nuiton.util.FileUpdaterHelper.JaxxFileUpdater} on the test sourcepath + * Test of a {@link JaxxFileUpdater} on the test sourcepath * * @author chemit */

1 0

r611 - trunk/src/main/java/org/nuiton/io/rest
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 15:18:58 +0200 (Sat, 10 Oct 2009) New Revision: 611 Modified: trunk/src/main/java/org/nuiton/io/rest/RestSession.java Log: Anomalie #85: le client rest doit avoir un encoding Modified: trunk/src/main/java/org/nuiton/io/rest/RestSession.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2009-10-09 11:01:16 UTC (rev 610) +++ trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2009-10-10 13:18:58 UTC (rev 611) @@ -42,6 +42,7 @@ import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; import org.apache.commons.httpclient.methods.multipart.Part; import org.apache.commons.httpclient.methods.multipart.StringPart; +import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,6 +66,8 @@ this.client = new HttpClient(); HostConfiguration hostConfiguration = new HostConfiguration(); hostConfiguration.setHost(configuration.getRestUrl().getHost()); + // set encoding (will then encode parameters fine) + this.client.getParams().setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, configuration.getEncoding()); this.client.setHostConfiguration(hostConfiguration); this.client.setState(new HttpState()); }

1 0

r610 - trunk
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 13:01:16 +0200 (Fri, 09 Oct 2009) New Revision: 610 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 11:01:08 UTC (rev 609) +++ trunk/pom.xml 2009-10-09 11:01:16 UTC (rev 610) @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>1.0.3</version> + <version>1.1.0-SNAPSHOT</version> <dependencies> @@ -289,9 +289,9 @@ </mailingLists> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> </scm> <issueManagement>

1 0

r609 - in tags: . maven-helper-plugin-1.0.3
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 13:01:08 +0200 (Fri, 09 Oct 2009) New Revision: 609 Added: tags/maven-helper-plugin-1.0.3/ Log: [maven-scm] copy for tag maven-helper-plugin-1.0.3 Property changes on: tags/maven-helper-plugin-1.0.3 ___________________________________________________________________ Added: svn:ignore + target Added: svn:mergeinfo +

1 0

r608 - trunk
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 13:00:56 +0200 (Fri, 09 Oct 2009) New Revision: 608 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release maven-helper-plugin-1.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 10:57:16 UTC (rev 607) +++ trunk/pom.xml 2009-10-09 11:00:56 UTC (rev 608) @@ -10,7 +10,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.0.3</version> <dependencies> @@ -289,9 +289,9 @@ </mailingLists> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu…</developerConnection> + <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he…</url> </scm> <issueManagement>

1 0

r607 - in trunk/src: main/java/org/nuiton/helper/plugin main/java/org/nuiton/license main/java/org/nuiton/license/plugin main/java/org/nuiton/util site/apt
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 12:57:16 +0200 (Fri, 09 Oct 2009) New Revision: 607 Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java trunk/src/main/java/org/nuiton/license/License.java trunk/src/main/java/org/nuiton/license/LicenseFactory.java trunk/src/main/java/org/nuiton/license/LicenseResolver.java trunk/src/main/java/org/nuiton/license/plugin/AvailableLicensesPlugin.java trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java trunk/src/main/java/org/nuiton/license/plugin/ThirdPartyPlugin.java trunk/src/main/java/org/nuiton/util/DependencyUtil.java trunk/src/main/java/org/nuiton/util/FileUpdater.java trunk/src/main/java/org/nuiton/util/FileUpdaterHelper.java trunk/src/main/java/org/nuiton/util/MirroredFileUpdater.java trunk/src/main/java/org/nuiton/util/PluginHelper.java trunk/src/main/java/org/nuiton/util/PluginIOContext.java trunk/src/main/java/org/nuiton/util/SourceEntry.java trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java trunk/src/main/java/org/nuiton/util/package.html trunk/src/site/apt/index.apt Log: prepare compatibility release 1.0.3 (1.1.0 will remove all obsolote codes) Modified: trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java 2009-10-09 10:57:16 UTC (rev 607) @@ -37,7 +37,7 @@ * @phase validate * @author chemit * @since 1.0.2 - * @deprecated since 1.1.0, reuse just a enforcer plugin to check those files. + * @deprecated since 1.0.3, reuse just a enforcer plugin to check those files. (removed in 1.1.0) */ @Deprecated public class CheckProjectFilesPlugin extends AbstractPlugin { Modified: trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java =================================================================== --- trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/license/JarLicenseResolver.java 2009-10-09 10:57:16 UTC (rev 607) @@ -36,7 +36,7 @@ * * @author chemit * @see LicenseResolver - * @deprecated since 1.0.3, move all license stuff in maven-license-plugin + * @deprecated since 1.0.3, move all license stuff in maven-license-plugin (removed in 1.1.0) */ @Deprecated public class JarLicenseResolver extends LicenseResolver { Modified: trunk/src/main/java/org/nuiton/license/License.java =================================================================== --- trunk/src/main/java/org/nuiton/license/License.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/license/License.java 2009-10-09 10:57:16 UTC (rev 607) @@ -32,7 +32,7 @@ * The model of a license. * * @author chemit - * @deprecated since 1.0.3, move all license stuff in maven-license-plugin + * @deprecated since 1.0.3, move all license stuff in maven-license-plugin (removed in 1.1.0) */ @Deprecated public class License { Modified: trunk/src/main/java/org/nuiton/license/LicenseFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/license/LicenseFactory.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/license/LicenseFactory.java 2009-10-09 10:57:16 UTC (rev 607) @@ -34,7 +34,7 @@ * To obtain an instance of a {@link org.nuiton.license.LicenseFactory} use the method {@link #newInstance(String[])}. * * @author chemit - * @deprecated since 1.0.3, move all license stuff in maven-license-plugin + * @deprecated since 1.0.3, move all license stuff in maven-license-plugin (removed in 1.1.0) */ @Deprecated public class LicenseFactory { Modified: trunk/src/main/java/org/nuiton/license/LicenseResolver.java =================================================================== --- trunk/src/main/java/org/nuiton/license/LicenseResolver.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/license/LicenseResolver.java 2009-10-09 10:57:16 UTC (rev 607) @@ -46,7 +46,7 @@ * </pre> * * @author chemit - * @deprecated since 1.0.3, move all license stuff in maven-license-plugin + * @deprecated since 1.0.3, move all license stuff in maven-license-plugin (removed in 1.1.0) */ @Deprecated public class LicenseResolver { Modified: trunk/src/main/java/org/nuiton/license/plugin/AvailableLicensesPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AvailableLicensesPlugin.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/license/plugin/AvailableLicensesPlugin.java 2009-10-09 10:57:16 UTC (rev 607) @@ -33,7 +33,7 @@ * @author chemit * @goal available-licenses * @requiresProject false - * @deprecated since 1.0.3, move all license stuff in maven-license-plugin + * @deprecated since 1.0.3, move all license stuff in maven-license-plugin (removed in 1.1.0) */ @Deprecated public class AvailableLicensesPlugin extends AbstractMojo { Modified: trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/license/plugin/LicensePlugin.java 2009-10-09 10:57:16 UTC (rev 607) @@ -34,7 +34,7 @@ * @phase generate-resources * @requiresProject true * @requiresDependencyResolution compile - * @deprecated since 1.0.3, move all license stuff in maven-license-plugin + * @deprecated since 1.0.3, move all license stuff in maven-license-plugin (removed in 1.1.0) */ @Deprecated public class LicensePlugin extends org.nuiton.plugin.AbstractPlugin { Modified: trunk/src/main/java/org/nuiton/license/plugin/ThirdPartyPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/ThirdPartyPlugin.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/license/plugin/ThirdPartyPlugin.java 2009-10-09 10:57:16 UTC (rev 607) @@ -52,7 +52,7 @@ * @phase generate-resources * @requiresDependencyResolution test * @requiresProject true - * @deprecated since 1.0.3, move all license stuff in maven-license-plugin + * @deprecated since 1.0.3, move all license stuff in maven-license-plugin (removed in 1.1.0) */ @Deprecated public class ThirdPartyPlugin extends AbstractPlugin { Modified: trunk/src/main/java/org/nuiton/util/DependencyUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DependencyUtil.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/DependencyUtil.java 2009-10-09 10:57:16 UTC (rev 607) @@ -34,7 +34,7 @@ * * @author chemit * @since 0.5 - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated public class DependencyUtil { Modified: trunk/src/main/java/org/nuiton/util/FileUpdater.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUpdater.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/FileUpdater.java 2009-10-09 10:57:16 UTC (rev 607) @@ -28,7 +28,7 @@ * use {@link #isFileUpToDate(java.io.File)} to determine if a file is up to date. * * @author chemit - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated Modified: trunk/src/main/java/org/nuiton/util/FileUpdaterHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUpdaterHelper.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/FileUpdaterHelper.java 2009-10-09 10:57:16 UTC (rev 607) @@ -24,7 +24,7 @@ /** * @author chemit - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated public class FileUpdaterHelper { Modified: trunk/src/main/java/org/nuiton/util/MirroredFileUpdater.java =================================================================== --- trunk/src/main/java/org/nuiton/util/MirroredFileUpdater.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/MirroredFileUpdater.java 2009-10-09 10:57:16 UTC (rev 607) @@ -29,7 +29,7 @@ * Simple base implementation of a {@link FileUpdater} for an updater with a sourcedir and a destinationdir. * * @author chemit - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated public class MirroredFileUpdater implements FileUpdater { Modified: trunk/src/main/java/org/nuiton/util/PluginHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PluginHelper.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/PluginHelper.java 2009-10-09 10:57:16 UTC (rev 607) @@ -57,7 +57,7 @@ * Une classe pour mutualiser toutes les méthodes utiles pour un plugin. * * @author chemit - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated public class PluginHelper { Modified: trunk/src/main/java/org/nuiton/util/PluginIOContext.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PluginIOContext.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/PluginIOContext.java 2009-10-09 10:57:16 UTC (rev 607) @@ -32,7 +32,7 @@ * * @author chemit * @since 1.0.1 - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated public class PluginIOContext { Modified: trunk/src/main/java/org/nuiton/util/SourceEntry.java =================================================================== --- trunk/src/main/java/org/nuiton/util/SourceEntry.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/SourceEntry.java 2009-10-09 10:57:16 UTC (rev 607) @@ -44,7 +44,7 @@ * to expose his methods.</b> * * @author tony - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated public class SourceEntry { Modified: trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java =================================================================== --- trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/VelocityTemplateGenerator.java 2009-10-09 10:57:16 UTC (rev 607) @@ -53,7 +53,7 @@ * * @author chemit * @since 1.3 - * @deprecated since 1.0.3, move to package org.nuiton.plugin + * @deprecated since 1.0.3, move to package org.nuiton.plugin (removed in 1.1.0) */ @Deprecated public class VelocityTemplateGenerator { Modified: trunk/src/main/java/org/nuiton/util/package.html =================================================================== --- trunk/src/main/java/org/nuiton/util/package.html 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/main/java/org/nuiton/util/package.html 2009-10-09 10:57:16 UTC (rev 607) @@ -1,5 +1,5 @@ <html> <body> -<h1>Deprecated, will be remove before version 2.0.0</h1> +<h1>Deprecated, will be remove before version 1.1.0</h1> </body> </html> \ No newline at end of file Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2009-10-09 10:50:02 UTC (rev 606) +++ trunk/src/site/apt/index.apt 2009-10-09 10:57:16 UTC (rev 607) @@ -29,11 +29,11 @@ * {{{help-mojo.html} helper:help}} display help about the plugin (goals, usage). - * {{{add-license-mojo.html} helper:add-license}} *DEPRECATED* add license file and third-party files to classpath (generate them if necessary). + * {{{add-license-mojo.html} helper:add-license}} <DEPRECATED> add license file and third-party files to classpath (generate them if necessary). - * {{{add-third-party-mojo.html} helper:add-third-party}} *DEPRECATED* write the licenses of all third-party libraries used in project. + * {{{add-third-party-mojo.html} helper:add-third-party}} <DEPRECATED> write the licenses of all third-party libraries used in project. - * {{{available-licenses-mojo.html} helper:available-licenses}} *DEPRECATED* display the known licenses of the plugin. + * {{{available-licenses-mojo.html} helper:available-licenses}} <DEPRECATED> display the known licenses of the plugin. Consult the {{{mojo-usages.html}usages}} page to have more details of mojos.

1 0

r606 - trunk
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 12:50:02 +0200 (Fri, 09 Oct 2009) New Revision: 606 Modified: trunk/pom.xml Log: - avoid aggregate javadoc on site generation - avoid execution in pluginManagement Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 09:46:13 UTC (rev 605) +++ trunk/pom.xml 2009-10-09 10:50:02 UTC (rev 606) @@ -338,9 +338,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> <maven.test.skip>false</maven.test.skip> - <maven.test.forkMode>once</maven.test.forkMode>  <maven.reports.generate>true</maven.reports.generate> @@ -380,6 +378,7 @@ </executions> </plugin> +  <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -444,29 +443,12 @@ <version>2.4.3</version> <configuration> <skip>${maven.test.skip}</skip> - <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> - <forkMode>${maven.test.forkMode}</forkMode> </configuration> </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> <version>2.1</version> - <inherited>true</inherited> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> </plugin> <plugin> @@ -643,21 +625,6 @@ </taglet> </taglets> </configuration> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> - <id>attach-test-javadocs</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> @@ -708,6 +675,7 @@ <version>${javadoc.version}</version> <configuration> <quiet>true</quiet> +  <docencoding>${project.build.sourceEncoding}</docencoding> <encoding>${project.build.sourceEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> @@ -876,6 +844,14 @@ </taglet> </taglets> </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> </plugin> <!-- changelog:changelog @@ -963,10 +939,11 @@ <executions> <execution> <id>attach-sources</id> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> </execution> - <execution> - <id>attach-test-sources</id> - </execution> </executions> </plugin> @@ -976,10 +953,11 @@ <executions> <execution> <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> </execution> - <execution> - <id>attach-test-javadocs</id> - </execution> </executions> </plugin>

1 0

r605 - trunk/src/main/java/org/nuiton/plugin
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 11:46:13 +0200 (Fri, 09 Oct 2009) New Revision: 605 Modified: trunk/src/main/java/org/nuiton/plugin/PluginHelper.java Log: add usefull method splitAndTrim Modified: trunk/src/main/java/org/nuiton/plugin/PluginHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2009-10-09 08:18:25 UTC (rev 604) +++ trunk/src/main/java/org/nuiton/plugin/PluginHelper.java 2009-10-09 09:46:13 UTC (rev 605) @@ -123,6 +123,23 @@ } /** + * Split the given {@code text} using the {@code separator} and trim + * each part of result. + * + * @param txt text to split + * @param separator the split separator + * @return the splited text with trimmed parts. + * @since 1.1.0 + */ + public static String[] splitAndTrim(String txt, String separator) { + String[] result = txt.split(separator); + for (int i = 0, j = result.length; i < j; i++) { + result[i] = result[i].trim(); + } + return result; + } + + /** * Prefix the lines of the given content with a given prefix. * * @param prefix prefix to add on each line of text

1 0