r1678 - in trunk: . src/main/java/org/nuiton/license/plugin - Maven-license-plugin-commits

21 Jan 2010

Author: tchemit
Date: 2010-01-21 13:48:31 +0100 (Thu, 21 Jan 2010)
New Revision: 1678

Modified:
   trunk/pom.xml
   trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFileMojo.java
   trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFileMojo.java
Log:
- Anomalie #250: Change mojo properties expression from helper.XXX to license.XXX
- fix documentation if mojo


Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2010-01-21 12:38:11 UTC (rev 1677)
+++ trunk/pom.xml	2010-01-21 12:48:31 UTC (rev 1678)
@@ -289,7 +289,7 @@
 
         <processor.version>1.0.2</processor.version>
 
-        <!-- documention is in english -->
+        <!-- documentation is in english -->
         <maven.site.locales>en</maven.site.locales>
         
     </properties>

Modified: trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFileMojo.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFileMojo.java	2010-01-21 12:38:11 UTC (rev 1677)
+++ trunk/src/main/java/org/nuiton/license/plugin/AddLicenseFileMojo.java	2010-01-21 12:48:31 UTC (rev 1678)
@@ -52,7 +52,7 @@
     /**
      * Fichier de la licence du module.
      *
-     * @parameter expression="${helper.licenceFile}" default-value="${basedir}/LICENSE.txt"
+     * @parameter expression="${license.licenceFile}" default-value="${basedir}/LICENSE.txt"
      * @required
      * @since 1.0.0
      */
@@ -73,7 +73,7 @@
     /**
      * Repertoire de sortie des sources.
      *
-     * @parameter expression="${helper.outputDirectory}" default-value="target/generated-sources/license"
+     * @parameter expression="${license.outputDirectory}" default-value="target/generated-sources/license"
      * @required
      * @since 1.0.0
      */
@@ -81,7 +81,7 @@
     /**
      * Repertoire de sortie des classes (classpath).
      *
-     * @parameter expression="${helper.licenceFilename}" default-value=""
+     * @parameter expression="${license.licenceFilename}" default-value=""
      * @since 1.0.0
      */
     protected String licenseFilename;
@@ -96,21 +96,21 @@
     /**
      * Un flag pour conserver un backup des fichiers modifies.
      *
-     * @parameter expression="${helper.keepBackup}"  default-value="false"
+     * @parameter expression="${license.keepBackup}"  default-value="false"
      * @since 1.0.0
      */
     protected boolean keepBackup;
     /**
      * Un flag pour forcer la generation.
      *
-     * @parameter expression="${helper.force}"  default-value="false"
+     * @parameter expression="${license.force}"  default-value="false"
      * @since 1.0.0
      */
     protected boolean force;
     /**
      * Un flag pour activer le mode verbeux.
      *
-     * @parameter expression="${helper.verbose}"  default-value="${maven.verbose}"
+     * @parameter expression="${license.verbose}"  default-value="${maven.verbose}"
      * @since 1.0.0
      */
     protected boolean verbose;
@@ -119,36 +119,27 @@
      * <p/>
      * Cette option n'est utilisable que sur des modules avec un class-path (pas pour un pom)
      *
-     * @parameter expression="${helper.copyToMETA_INF}"  default-value="false"
+     * @parameter expression="${license.copyToMETA_INF}"  default-value="false"
      * @since 1.0.0
      */
     protected boolean copyToMETA_INF;
     /**
      * La baseURL d'un resolver de license supplementaire
      *
-     * @parameter expression="${helper.extraResolver}"
+     * @parameter expression="${license.extraResolver}"
      * @since 1.0.0
      */
     protected String[] extraResolver;
     protected License license;
 
-//    public AddLicenseFileMojo() {
-//        super("all files are up-to-date.");
-//    }
-
     protected boolean hasClassPath() {
         return rejectPackaging(Packaging.pom);
     }
-//    @Override
-//    protected boolean ensurePackaging() {
-    //        return false;
-////        return project != null && ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging()));
-//    }
+
     boolean doGenerate;
 
     @Override
     protected void init() throws Exception {
-//    protected boolean init() throws Exception {
 
         // must generate if file does not exist
         doGenerate = true;
@@ -167,8 +158,6 @@
         if (licenseFilename == null || licenseFilename.isEmpty()) {
             licenseFilename = licenseName;
         }
-        // always execute the mojo ?
-//        return true;
     }
 
     @Override
@@ -186,8 +175,6 @@
                 }
                 // copy it to backup file
                 backupFile(licenseFile);
-//                File backup = new File(licenseFile.getAbsolutePath() + "~");
-//                licenseFile.renameTo(backup);
             }
         }
 
@@ -208,7 +195,6 @@
                 copyFile(licenseFile, destFile);
             }
             addResourceDir(outputDirectory, "**/*.txt");
-//            addResourceDir(outputDirectory.getAbsolutePath());
         }
     }
 

Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFileMojo.java
===================================================================
--- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFileMojo.java	2010-01-21 12:38:11 UTC (rev 1677)
+++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyFileMojo.java	2010-01-21 12:48:31 UTC (rev 1678)
@@ -67,7 +67,7 @@
     /**
      * Fichier ou ecrire les licences des dependances.
      *
-     * @parameter expression="${helper.thirdPartyFilename}" default-value="THIRD-PARTY.txt"
+     * @parameter expression="${license.thirdPartyFilename}" default-value="THIRD-PARTY.txt"
      * @required
      * @since 1.0.0
      */
@@ -75,7 +75,7 @@
     /**
      * Repertoire de sortie des classes (classpath).
      *
-     * @parameter expression="${helper.outputDirectory}" default-value="target/generated-sources/license"
+     * @parameter expression="${license.outputDirectory}" default-value="target/generated-sources/license"
      * @required
      * @since 1.0.0
      */
@@ -83,7 +83,7 @@
     /**
      * Encoding a utiliser pour lire et ecrire les fichiers.
      *
-     * @parameter expression="${helper.encoding}" default-value="${project.build.sourceEncoding}"
+     * @parameter expression="${license.encoding}" default-value="${project.build.sourceEncoding}"
      * @required
      * @since 1.0.0
      */
@@ -91,28 +91,28 @@
     /**
      * Un flag pour forcer la generation.
      *
-     * @parameter expression="${helper.force}"  default-value="false"
+     * @parameter expression="${license.force}"  default-value="false"
      * @since 1.0.0
      */
     protected boolean force;
     /**
      * Un flag pour conserver un backup des fichiers modifies.
      *
-     * @parameter expression="${helper.keepBackup}"  default-value="false"
+     * @parameter expression="${license.keepBackup}"  default-value="false"
      * @since 1.0.0
      */
     protected boolean keepBackup;
     /**
      * Un flag pour faire une copie nommé dans META-INF (prefixe avec le nom de l'artifact).
      *
-     * @parameter expression="${helper.copyToMETA_INF}"  default-value="false"
+     * @parameter expression="${license.copyToMETA_INF}"  default-value="false"
      * @since 1.0.0
      */
     protected boolean copyToMETA_INF;
     /**
      * Un flag pour activer le mode verbeux.
      *
-     * @parameter expression="${helper.verbose}"  default-value="${maven.verbose}"
+     * @parameter expression="${license.verbose}"  default-value="${maven.verbose}"
      * @since 1.0.0
      */
     protected boolean verbose;

    

r1678 - in trunk: . src/main/java/org/nuiton/license/plugin

tchemit＠users.nuiton.org

tags

participants (1)