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

r620 - in trunk: . src/main/java/org/nuiton/helper/plugin src/test/java/org/nuiton/plugin src/test/resources/org/nuiton/mail/plugin src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest
by tchemit＠users.nuiton.org 01 Nov '09

01 Nov '09

Author: tchemit Date: 2009-11-01 17:18:50 +0100 (Sun, 01 Nov 2009) New Revision: 620 Added: trunk/src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest/ Removed: trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java trunk/src/test/resources/org/nuiton/mail/plugin/SendEmailMojoTest/ Modified: trunk/changelog.txt trunk/pom.xml trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java trunk/src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest/sendEmail.xml trunk/src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest/skipSendEmail.xml Log: change test dir (use a decapitalize package name to avoid class name collision) prepare next release Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-30 20:37:39 UTC (rev 619) +++ trunk/changelog.txt 2009-11-01 16:18:50 UTC (rev 620) @@ -1,3 +1,22 @@ +maven-helper-plugin (1.1.0) stable; urgency=high + + * [FIX #60] rendre le plugin compatible maven 2.2.x + * [FIX #85] le client rest doit avoir un encoding + * [FEATURE #45] utiliser des generics dans le framework de test de mojos + * [FEATURE #46] ajout d'un contrat pour faire des parseurs xpp3 + * [FEATURE #50] utilisation Junit 4.7 et amélioration du framework de test des Mojos + * [FEATURE #51] Rethink to AbstractPlugin api + * [FEATURE #52] ajout d'un goal neutre d'envoie de mail + * [FEATURE #53] ajout d'un goal pour collecter des donnees + * [FEATURE #54] ajout d'un client rest basique + * [FEATURE #61] ajout des tests d'intégration + * [FEATURE #65] reorganisation des packages + * [FEATURE #66] documentation des frameworks mojo et test mojo + * [FEATURE #69] ajout d'un goal pour exposer des secrets du serveur + * [FEATURE #86] Déplacement du paquetage license vers maven-license-plugin + + -- chemit -- Sun, 01 Nov 2009 15:50:59 +0100 + maven-helper-plugin (1.0.3) stable; urgency=high * [FEATURE #46] ajout d'un contrat pour faire des parseurs xpp3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-30 20:37:39 UTC (rev 619) +++ trunk/pom.xml 2009-11-01 16:18:50 UTC (rev 620) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>    - + <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> @@ -28,13 +29,13 @@ <artifactId>commons-lang</artifactId> <version>2.4</version> </dependency> - + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> <version>3.1</version> </dependency> - + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> @@ -54,7 +55,7 @@ </dependency>  - + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> @@ -72,13 +73,13 @@ <artifactId>plexus-cipher</artifactId> <version>1.5</version> </dependency> - + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> <version>1.0-alpha-9-stable-1</version> </dependency> - + <dependency> <groupId>plexus</groupId> <artifactId>plexus-mail-sender-api</artifactId> @@ -114,7 +115,7 @@ </exclusion> </exclusions> </dependency> - +  <dependency> @@ -135,7 +136,7 @@ <version>${maven.version}</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> @@ -149,16 +150,16 @@ <scope>provided</scope> </dependency> -  +  <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.4</version> </dependency> - +  <dependency> @@ -192,7 +193,7 @@ <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> </exclusion> - + </exclusions> </dependency> @@ -234,7 +235,7 @@ </licenses> <developers> - + <developer> <name>Eric Chatellier</name> <id>echatellier</id> @@ -326,7 +327,7 @@ <packaging>maven-plugin</packaging> <properties> - + <license.version>2.0.0</license.version> <maven.version>2.2.1</maven.version> <plexusMailSender.version>1.0-alpha-2</plexusMailSender.version> @@ -338,14 +339,15 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - + <maven.test.skip>false</maven.test.skip> + <maven.javadoc.skip>false</maven.javadoc.skip>  <maven.reports.generate>true</maven.reports.generate> <license.licenseName>lgpl_v3</license.licenseName> - + <repository.home.url>http://maven.nuiton.org/release</repository.home.url> </properties> @@ -367,7 +369,7 @@ </testResources> <plugins> - + <plugin> <artifactId>maven-plugin-plugin</artifactId> <executions> @@ -435,11 +437,11 @@ <encoding>${project.reporting.outputEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> <quiet>true</quiet> -  -  + <skip>${maven.javadoc.skip}</skip> <taglets> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -447,7 +449,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -455,7 +458,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -471,7 +475,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -487,7 +492,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -495,7 +501,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -503,7 +510,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -535,7 +543,9 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -543,7 +553,9 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -551,7 +563,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -559,7 +572,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -567,7 +581,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -629,7 +644,7 @@ <artifactId>maven-invoker-plugin</artifactId> <version>1.3</version> </plugin> - + <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> @@ -650,6 +665,28 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.1.2</version> + <configuration> + <dependencyDetailsEnabled>${maven.reports.dependencyDetailsEnabled}</dependencyDetailsEnabled> + <dependencyLocationsEnabled>${maven.reports.dependencyLocationsEnabled}</dependencyLocationsEnabled> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> @@ -657,7 +694,7 @@ <version>${javadoc.version}</version> <configuration> <quiet>true</quiet> -  + <skip>${maven.javadoc.skip}</skip> <docencoding>${project.build.sourceEncoding}</docencoding> <encoding>${project.build.sourceEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> @@ -696,7 +733,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -712,7 +750,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -720,7 +759,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -760,7 +800,9 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -768,7 +810,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -776,7 +819,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -784,7 +828,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -792,7 +837,8 @@ </tagletArtifact> </taglet> <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + </tagletClass> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-tools-javadoc</artifactId> @@ -843,7 +889,7 @@ <artifactId>maven-changelog-plugin</artifactId> <version>2.1</version> </plugin> - +  <plugin> <artifactId>maven-changes-plugin</artifactId> @@ -900,7 +946,7 @@ </plugins> </reporting> - + <profiles>  <profile> @@ -911,7 +957,7 @@ <value>true</value> </property> </activation> - + <build> <plugins> @@ -982,7 +1028,7 @@ <maven.reports.generate>false</maven.reports.generate> </properties> </profile> -  +  <profile> <id>nodepdetails</id> <activation> Deleted: trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java 2009-10-30 20:37:39 UTC (rev 619) +++ trunk/src/main/java/org/nuiton/helper/plugin/CheckProjectFilesPlugin.java 2009-11-01 16:18:50 UTC (rev 620) @@ -1,129 +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.helper.plugin; - -import org.nuiton.plugin.*; -import java.io.File; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; - -/** - * Check that : - * - * 1) the changelog exists on standalone module or root module of a - * multi-module project. - * 2) any project module has a README.txt and LICENSE.txt file - * - * @goal check-project-files - * @requiresProject true - * @phase validate - * @author chemit - * @since 1.0.2 - * @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 { - - /** - * Dependance du projet. - * - * @parameter default-value="${project}" - * @required - * @since 1.0.2 - */ - protected MavenProject project; - /** - * Un flag pour activer le mode verbeux. - * - * @parameter expression="${helper.verbose}" default-value="${maven.verbose}" - * @since 1.0.2 - */ - protected boolean verbose; - - @Override - public MavenProject getProject() { - return project; - } - - @Override - public void setProject(MavenProject project) { - this.project = project; - } - - @Override - public boolean isVerbose() { - return verbose; - } - - @Override - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - @Override - protected boolean init() throws Exception { - return true; - } - - @Override - protected void doAction() throws Exception { - checkChangelogFile(); - checkReadmeFile(); - checkLicenseFile(); - } - - protected void checkChangelogFile() throws MojoExecutionException { - if (project.isExecutionRoot()) { - File f = new File(project.getBasedir(), "changelog.txt"); - if (!f.exists()) { - throw new MojoExecutionException("the module " + project.getName() + " requires the file " + f.getAbsolutePath()); - } else { - if (verbose) { - getLog().info("changelog file dectected : " + f.getAbsolutePath()); - } - } - } else { - getLog().info("changelog.txt is not required for module " + project.getName() + " (not a root module)"); - } - } - - protected void checkReadmeFile() throws MojoExecutionException { - File f = new File(project.getBasedir(), "README.txt"); - if (!f.exists()) { - throw new MojoExecutionException("the module " + project.getName() + " requires the file " + f.getAbsolutePath()); - } else { - if (verbose) { - getLog().info("readme file dectected : " + f.getAbsolutePath()); - } - } - } - - protected void checkLicenseFile() throws MojoExecutionException { - File f = new File(project.getBasedir(), "LICENSE.txt"); - if (!f.exists()) { - throw new MojoExecutionException("the module " + project.getName() + " requires the file " + f.getAbsolutePath()); - } else { - if (verbose) { - getLog().info("license file dectected : " + f.getAbsolutePath()); - } - } - } -} Modified: trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2009-10-30 20:37:39 UTC (rev 619) +++ trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2009-11-01 16:18:50 UTC (rev 620) @@ -20,7 +20,9 @@ */ package org.nuiton.plugin; +import java.beans.Introspector; import java.io.File; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.maven.plugin.Mojo; @@ -35,12 +37,12 @@ /** * Base test class for a mojo. - * + * * Note: replace the previous class * {@code org.nuiton.util.BasePluginTestCase}. * * Inside each test method, we can use the following objects : - * + * * <ul> * <li>{@link #getTestDir()} : location of mojo resources (where the pom file for example)</li> * <li>{@link #getPomFile()} : location of the pom file</li> @@ -57,9 +59,9 @@ * <li>{@link #createMojo(java.io.File, java.lang.String)}</li> * <li>{@link #setUpMojo(org.nuiton.plugin.Plugin, java.io.File)}</li> * </ul> - * + * + * @author chemit * @param type of goal to test - * @author chemit * @since 1.0.3 */ public abstract class AbstractMojoTest { @@ -117,9 +119,8 @@ * * By convention, we should consider that a test class use always the same * goal's name. - * + * * @param methodName the name of the next test to execute. - * * @return the name of the goal to test for the given method test name. */ protected abstract String getGoalName(String methodName); @@ -130,16 +131,17 @@ * * By convention, will be the package named by the test class name from the * {@link #getTestBasedir()}. - * + * * @param methodName the method of the next test to execute - * @param goalName the common goal name to use + * @param goalName the common goal name to use * @return the directory where to find resources for the test */ protected File getTestDir(String methodName, String goalName) { - String rep = getClass().getName(); + //TC-20091101 use a decipatilize simple name to avoid conflict of package with + // existing class name. + String rep = getClass().getPackage().getName() + "." + Introspector.decapitalize(getClass().getSimpleName()); rep = rep.replaceAll("\\.", File.separator); - File testDir = new File(getTestBasedir(), rep); if (isVerbose()) { log.info("test dir = " + getRelativePathFromBasedir(testDir)); @@ -155,11 +157,11 @@ * * By default, the pom file is the file with name {@code methodName+".xml"} * in the {@code testDir}. - * - * @param testDir the location of resources for the next test (is the result - * of the method {@link #getTestDir(java.lang.String, java.lang.String)}. + * + * @param testDir the location of resources for the next test (is the result + * of the method {@link #getTestDir(java.lang.String, java.lang.String)}. * @param methodName the name of the next test - * @param goalName the name of the common goal + * @param goalName the name of the common goal * @return the location of the pom file for the next mojo test. */ protected File getPomFile(File testDir, String methodName, String goalName) { @@ -178,7 +180,7 @@ * Create the mojo base on the given {@code pomFile} for the * given {@code goalName}. * - * @param pomFile the location of the pom file + * @param pomFile the location of the pom file * @param goalName the name of the goal to lookup * @return the instanciated mojo * @throws Exception if any problem while creating the mojo @@ -193,7 +195,7 @@ /** * Initialize the given mojo. * - * @param mojo the instanciate mojo + * @param mojo the instanciate mojo * @param pomFile the pom file used to instanciate the mojo * @throws Exception if any pb */ @@ -238,7 +240,7 @@ /** * To offer inside each test method (annotated by a {@link org.junit.Test}) the * following properties : - * + * * <ul> * <li>{@link #testDir} : location where to find resources for the test</li> * <li>{@link #pomFile} : location of the pom file to use to build the mojo</li> Modified: trunk/src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest/sendEmail.xml =================================================================== --- trunk/src/test/resources/org/nuiton/mail/plugin/SendEmailMojoTest/sendEmail.xml 2009-10-30 20:37:39 UTC (rev 619) +++ trunk/src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest/sendEmail.xml 2009-11-01 16:18:50 UTC (rev 620) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <configuration> - <emailContentFile>target/test-classes/org/nuiton/mail/plugin/SendEmailMojoTest/mailContentFile.txt</emailContentFile> + <emailContentFile>target/test-classes/org/nuiton/mail/plugin/sendEmailMojoTest/mailContentFile.txt</emailContentFile> <emailTitle>[ANNOUNCEMENT] - One 1.0.0 released</emailTitle> <encoding>UTF-8</encoding> <skipSendEmail>false</skipSendEmail> Modified: trunk/src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest/skipSendEmail.xml =================================================================== --- trunk/src/test/resources/org/nuiton/mail/plugin/SendEmailMojoTest/skipSendEmail.xml 2009-10-30 20:37:39 UTC (rev 619) +++ trunk/src/test/resources/org/nuiton/mail/plugin/sendEmailMojoTest/skipSendEmail.xml 2009-11-01 16:18:50 UTC (rev 620) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <configuration> - <emailContentFile>target/test-classes/org/nuiton/smail/plugin/SendEmailMojoTest/mailContentFile.txt</emailContentFile> + <emailContentFile>target/test-classes/org/nuiton/smail/plugin/sendEmailMojoTest/mailContentFile.txt</emailContentFile> <emailTitle>[ANNOUNCEMENT] - One 1.0.0 released</emailTitle> <encoding>UTF-8</encoding> <skipSendEmail>true</skipSendEmail>

1 0

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

30 Oct '09

Author: tchemit Date: 2009-10-30 21:37:39 +0100 (Fri, 30 Oct 2009) New Revision: 619 Modified: trunk/ Log: svn ignore Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target + target *.iml

1 0

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

30 Oct '09

Author: tchemit Date: 2009-10-30 21:24:58 +0100 (Fri, 30 Oct 2009) New Revision: 618 Modified: trunk/src/main/java/org/nuiton/io/rest/RestSession.java Log: add more logs Modified: trunk/src/main/java/org/nuiton/io/rest/RestSession.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2009-10-16 12:25:15 UTC (rev 617) +++ trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2009-10-30 20:24:58 UTC (rev 618) @@ -48,11 +48,18 @@ /** * A REST session. - * + * * @author chemit * @since 1.0.3 */ public class RestSession { +// uncomment this to debug the request send by httpclient +// static { +// System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog"); +// System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true"); +// System.setProperty("org.apache.commons.logging.simplelog.log.httpclient.wire.header", "debug"); +// System.setProperty("org.apache.commons.logging.simplelog.log.org.apache.commons.httpclient", "debug"); +// } protected HttpClient client; protected static final Log log = LogFactory.getLog(RestSession.class); @@ -219,6 +226,9 @@ continue; } paramParts.add(new StringPart(key, value)); + if (log.isDebugEnabled()) { + log.debug("add parameter [" + key + "]=" + value); + } } } @@ -226,12 +236,21 @@ for (Entry<String, File> entry : attachments.entrySet()) { String key = entry.getKey(); File file = entry.getValue(); - paramParts.add(new FilePart(key, file.getName(), file)); + if (log.isDebugEnabled()) { + log.debug("add attachment " + key + "=" + file); + } + paramParts.add(new FilePart(key, file.getName(), file, FilePart.DEFAULT_CONTENT_TYPE, configuration.getEncoding())); } + if (attachments.isEmpty()) { + log.warn("no attachment in a multi-part request!"); + } Part[] parts = paramParts.toArray(new Part[paramParts.size()]); MultipartRequestEntity entity = new MultipartRequestEntity(parts, gm.getParams()); + if (log.isDebugEnabled()) { + entity.writeRequest(System.out); + } gm.setRequestEntity(entity); // gm.addRequestHeader("content-type", "multipart/form-data"); gm.addRequestHeader("content-type", entity.getContentType());

1 0

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

16 Oct '09

Author: tchemit Date: 2009-10-16 14:25:15 +0200 (Fri, 16 Oct 2009) New Revision: 617 Modified: trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java Log: add usefull methods on AbstractPlugin Modified: trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2009-10-13 12:43:34 UTC (rev 616) +++ trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2009-10-16 12:25:15 UTC (rev 617) @@ -33,6 +33,7 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Date; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -235,6 +236,23 @@ } /** + * Recupere le fichier donnée à partir de son chemin relatif sur le basedir + * du projet maven. + * + * @param paths les paths pour atteindre le fichier ou le répertoire + * + * @return le fichier de la destination + * @since 1.1.0 + */ + public File getFileFromBasedir(String... paths) { + File result = getProject().getBasedir(); + for (String path : paths) { + result = new File(result, path); + } + return result; + } + + /** * Copy a file to a given locationand logging. * * @param srcFile represents the file to copy. @@ -520,32 +538,33 @@ URLClassLoader result; try { + Set<String> dones = new HashSet<String>(); List<URL> lUrls = new ArrayList<URL>(); List<String> sources = project.getCompileSourceRoots(); if (addSourcesToClassPath) { for (String source : sources) { - lUrls.add(new File(source).toURI().toURL()); + addDirectoryToUrlsList(new File(source), lUrls, dones); } if (testPhase) { for (Object source : project.getTestCompileSourceRoots()) { - lUrls.add(new File(source.toString()).toURI().toURL()); + addDirectoryToUrlsList(new File(source.toString()), lUrls, dones); } } } if (addResourcesToClassPath) { for (Object source : project.getResources()) { Resource r = (Resource) source; - lUrls.add(new File(r.getDirectory()).toURI().toURL()); + addDirectoryToUrlsList(new File(r.getDirectory()), lUrls, dones); } } if (testPhase && addCompileClassPath) { if (project != null) { - lUrls.add(new File(project.getBuild().getOutputDirectory()).toURI().toURL()); + addDirectoryToUrlsList(new File(project.getBuild().getOutputDirectory()), lUrls, dones); } } if (src != null) { - lUrls.add(src.toURI().toURL()); + addDirectoryToUrlsList(src, lUrls, dones); } if (addProjectClassPath) { getLog().info("use project compile scope class-path"); @@ -553,7 +572,7 @@ Set<?> artifacts = project.getArtifacts(); for (Object o : artifacts) { Artifact a = (Artifact) o; - lUrls.add(a.getFile().toURI().toURL()); + addDirectoryToUrlsList(a.getFile(), lUrls, dones); } } @@ -579,6 +598,45 @@ } /** + * Add the given {@code directory} in {@code urls} if not already included. + * + * Note: We use a extra list to store file string representation, since + * we do NOT want any url resolution and the {@link URL#equals(java.lang.Object)} is + * doing some... + * + * @param directory the directory to insert in {@code urls} + * @param urls list of urls + * @param done list of string representation of urls + * @throws MalformedURLException if pb while converting file to url + * @since 1.1.0 + */ + protected void addDirectoryToUrlsList(File directory, List<URL> urls, Set<String> done) throws MalformedURLException { + // do the comparaison on a String to avoid url to be resolved (in URL.equals method) + addUrlToUrlsList(directory.toURI().toURL(), urls, done); + } + + /** + * Add the given {@code url} in {@code urls} if not already included. + * + * Note: We use a extra list to store file string representation, since + * we do NOT want any url resolution and the {@link URL#equals(java.lang.Object)} is + * doing some.. + * + * @param url the url to insert in {@code urls} + * @param urls list of urls + * @param done list of string representation of urls + * @since 1.1.0 + */ + protected void addUrlToUrlsList(URL url, List<URL> urls, Set<String> done) { + // do the comparaison on a String to avoid url to be resolved (in URL.equals method) + String u = url.toString(); + if (!done.contains(u)) { + done.add(u); + urls.add(url); + } + } + + /** * Obtain the url of a file, if file does not exist, try in the classPath. * * @param f the required resource file.

1 0

r616 - trunk/src/main/resources/META-INF/plexus
by tchemit＠users.nuiton.org 13 Oct '09

13 Oct '09

Author: tchemit Date: 2009-10-13 14:43:34 +0200 (Tue, 13 Oct 2009) New Revision: 616 Modified: trunk/src/main/resources/META-INF/plexus/components.xml Log: add a velocity component shared configuration Modified: trunk/src/main/resources/META-INF/plexus/components.xml =================================================================== --- trunk/src/main/resources/META-INF/plexus/components.xml 2009-10-11 20:59:58 UTC (rev 615) +++ trunk/src/main/resources/META-INF/plexus/components.xml 2009-10-13 12:43:34 UTC (rev 616) @@ -42,5 +42,26 @@ <_configurationFile>~/.m2/settings-security.xml</_configurationFile> </configuration> </component> + <component> + <role>org.codehaus.plexus.velocity.VelocityComponent</role> + <role-hint>maven-helper-plugin</role-hint> + <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation> + <configuration> + <properties> + <property> + <name>resource.loader</name> + <value>file,class</value> + </property> + <property> + <name>class.resource.loader.class</name> + <value>org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader</value> + </property> + <property> + <name>file.resource.loader.class</name> + <value>org.apache.velocity.runtime.resource.loader.FileResourceLoader</value> + </property> + </properties> + </configuration> + </component> </components> </component-set> \ No newline at end of file

1 0

r615 - in trunk/src/main/java/org/nuiton: helper/plugin plugin
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 22:59:58 +0200 (Sun, 11 Oct 2009) New Revision: 615 Modified: trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java Log: - review exception in AbstractPlugin - add checkRunOnceDone method Modified: trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java 2009-10-11 13:10:17 UTC (rev 614) +++ trunk/src/main/java/org/nuiton/helper/plugin/CollectFilesMojo.java 2009-10-11 20:59:58 UTC (rev 615) @@ -242,7 +242,9 @@ } } - getLog().info("collected file " + path); + if (isVerbose()) { + getLog().info("Collected file " + path); + } if (!dryRun && copyFiles) { // copy the collected file copyFile(f, dst); @@ -253,7 +255,9 @@ if (!dryRun && withDescriptionFile) { try { setFiles(description, incomingFiles); - getLog().info("Saved " + description); + if (isVerbose()) { + getLog().info("Saved " + description); + } } catch (IOException ex) { throw new MojoExecutionException("could not save file " + description, ex); } Modified: trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2009-10-11 13:10:17 UTC (rev 614) +++ trunk/src/main/java/org/nuiton/plugin/AbstractPlugin.java 2009-10-11 20:59:58 UTC (rev 615) @@ -32,6 +32,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -86,25 +87,32 @@ @Override public void execute() throws MojoExecutionException, MojoFailureException { + + boolean canContinue = checkPackaging(); + if (!canContinue) { + getLog().warn("The goal is skip due to packaging '" + getProject().getPackaging() + "'"); + return; + } + try { - boolean canContinue = checkPackaging(); - if (!canContinue) { - getLog().warn("The goal is skip due to packaging '" + getProject().getPackaging() + "'"); - return; - } - canContinue = init(); - if (!canContinue) { - getLog().warn(skipAfterInitMessage); - return; - } + } catch (Exception e) { + throw new MojoExecutionException("could not init goal " + getClass().getSimpleName() + " for reason : " + e.getMessage(), e); + } + if (!canContinue) { + getLog().warn(skipAfterInitMessage); + return; + } + + try { + doAction(); } catch (Exception e) { - throw new MojoExecutionException("could not init goal " + getClass().getSimpleName() + " for reason : " + e.getMessage(), e); + throw new MojoExecutionException("could not execute goal " + getClass().getSimpleName() + " for reason : " + e.getMessage(), e); } } @@ -171,6 +179,62 @@ } /** + * + * @return {@code true} if project is the root execution project + */ + protected boolean isExecutionRoot() { + return getProject().isExecutionRoot(); + } + + /** + * + * @param runOnce + * @param onlyForRoot + * @param buildStartTime + * @param newStartTime + * @return {@code true} if the goal was already invoked + */ + protected boolean checkRunOnceDone(boolean runOnce, boolean onlyForRoot, Date buildStartTime, Date newStartTime) { + + if (!runOnce) { + // will run each time + return false; + } + + if (onlyForRoot && !isExecutionRoot()) { + + // never do it for a child + return true; + } + + if (buildStartTime == null) { + // no build start time, so must run + return false; + } + + if (newStartTime == null) { + + // must run + return false; + } + + if (isVerbose()) { + getLog().info("build timestamp : " + buildStartTime); + getLog().info("plugin timestamp : " + newStartTime); + } + + if (newStartTime.getTime() > buildStartTime.getTime()) { + + // was already generated + return true; + } + + // must run + return false; + + } + + /** * Copy a file to a given locationand logging. * * @param srcFile represents the file to copy.

1 0

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. - * - * 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