Author: tchemit Date: 2009-05-13 20:10:26 +0000 (Wed, 13 May 2009) New Revision: 1535 Removed: maven-license-switcher-plugin/trunk/src/site/apt/ maven-license-switcher-plugin/trunk/src/site/fml/ Modified: maven-license-switcher-plugin/trunk/pom.xml maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/JavaLicenseGenerator.java maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/XmlLicenseGenerator.java maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java maven-license-switcher-plugin/trunk/src/site/site.xml Log: processor migrated to nuiton :) refactor processor plugin : no more used of AntTask todo remove from nuitonprocessor the Ant Taskes (at least put them in the plugin) Modified: maven-license-switcher-plugin/trunk/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2009-05-13 15:31:20 UTC (rev 1534) +++ maven-license-switcher-plugin/trunk/pom.xml 2009-05-13 20:10:26 UTC (rev 1535) @@ -24,8 +24,8 @@ <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinprocessor</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuitonprocessor</artifactId> <version>${processor.version}</version> <scope>compile</scope> </dependency> @@ -37,28 +37,8 @@ <scope>compile</scope> </dependency> - <!--dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - <version>1.2</version> - </dependency--> - <!-- tests dependencies --> - <!--dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency--> - - <!--dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-verifier</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency--> - <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> @@ -106,18 +86,17 @@ <properties> - <nuiton.project>nuitonbuilder</nuiton.project> - - <processor.version>0.18</processor.version> + <redmine.project>nuitonutil</redmine.project> + <processor.version>1.0.0-SNAPSHOT</processor.version> <!-- assuprimer du de l'utilisation de mavenpom --> <labs.id>12</labs.id> <labs.project>lutinutil</labs.project> - <maven.version>2.0.10</maven.version> - <helper.version>1.0.0-SNAPSHOT</helper.version> - + <helper.licenseName>lgpl_v3</helper.licenseName> + <site.home.url>http://lutinutil.labs.libre-entreprise.org</site.home.url> + <repository.home.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</repository.home.url> </properties> <build> @@ -162,16 +141,16 @@ </executions> </plugin--> <!-- plugin site --> - <!--plugin> + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> <groupId>org.codelutin</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </dependency> </dependencies> - </plugin--> + </plugin> </plugins> </build> @@ -190,6 +169,7 @@ <!-- ************************************************************* --> <!--Source control management--> + <!-- a supprimer au passage a mavenpom --> <scm> <url>${maven.scm.url}</url> <connection>${maven.scm.connection}</connection> Modified: maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/JavaLicenseGenerator.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/JavaLicenseGenerator.java 2009-05-13 15:31:20 UTC (rev 1534) +++ maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/JavaLicenseGenerator.java 2009-05-13 20:10:26 UTC (rev 1535) @@ -1,6 +1,6 @@ package org.nuiton.license; -import org.codelutin.processor.filters.LicenseFilter; +import org.nuiton.processor.filters.LicenseFilter; /** @author chemit */ public class JavaLicenseGenerator implements LicenseGenerator { Modified: maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/XmlLicenseGenerator.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/XmlLicenseGenerator.java 2009-05-13 15:31:20 UTC (rev 1534) +++ maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/XmlLicenseGenerator.java 2009-05-13 20:10:26 UTC (rev 1535) @@ -1,6 +1,6 @@ package org.nuiton.license; -import org.codelutin.processor.filters.LicenseFilter; +import org.nuiton.processor.filters.LicenseFilter; /** @author chemit */ public class XmlLicenseGenerator implements LicenseGenerator { Modified: maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java 2009-05-13 15:31:20 UTC (rev 1534) +++ maven-license-switcher-plugin/trunk/src/main/java/org/nuiton/license/plugin/SwitchLicensePlugin.java 2009-05-13 20:10:26 UTC (rev 1535) @@ -20,8 +20,6 @@ import org.apache.maven.plugin.MojoExecutionException; -import org.codelutin.processor.LicenseProcessor; -import org.codelutin.processor.filters.LicenseFilter; import org.nuiton.util.FileUtil; import java.io.BufferedReader; @@ -32,10 +30,13 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.apache.maven.project.MavenProject; import org.nuiton.AbstractPlugin; import org.nuiton.license.License; import org.nuiton.license.LicenseFactory; import org.nuiton.license.LicenseGenerator; +import org.nuiton.processor.LicenseProcessor; +import org.nuiton.processor.filters.LicenseFilter; import org.nuiton.util.FileUpdaterHelper; import org.nuiton.util.MirroredFileUpdater; @@ -51,9 +52,17 @@ public class SwitchLicensePlugin extends AbstractPlugin { /** + * Dependance du projet. + * + * @parameter default-value="${project}" + * @required + * @since 1.0.0 + */ + protected MavenProject project; + /** * Encoding a utiliser pour lire et ecrire les fichiers. * - * @parameter expression="${helper.encoding}" default-value="${project.build.sourceEncoding}" + * @parameter expression="${license-switcher.encoding}" default-value="${project.build.sourceEncoding}" * @required * @since 1.0.0 */ @@ -61,14 +70,14 @@ /** * Un flag pour forcer la generation. * - * @parameter expression="${helper.force}" default-value="false" + * @parameter expression="${license-switcher.force}" default-value="false" * @since 1.0.0 */ protected boolean force; /** * l'annee de creation du module (sera place dans le header) * - * @parameter default-value="${project.inceptionYear}" + * @parameter expression="${license-switcher.inceptionYear}" default-value="${project.inceptionYear}" * @required * @since 1.0.0 */ @@ -76,25 +85,23 @@ /** * le nom de l'organisation (sera place dans le header) * - * @parameter default-value="${project.organization.name}" + * @parameter expression="${license-switcher.organizationName}" default-value="${project.organization.name}" * @required - * @readonly * @since 1.0.0 */ protected String organizationName; /** * le nom du projet (sera place dans le header) * - * @parameter default-value="${project.name}" + * @parameter expression="${license-switcher.projectName}" default-value="${project.name}" * @required - * @readonly * @since 1.0.0 */ protected String projectName; /** * Le type de license a appliquer. * - * @parameter expression="${helper.licenseName}" + * @parameter expression="${license-switcher.licenseName}" * @required * @since 1.0.0 */ @@ -102,7 +109,7 @@ /** * Repertoires des fichiers sources a traiter. * - * @parameter expression="${helper.compileSourceRoots}" default-value="${project.compileSourceRoots}" + * @parameter expression="${license-switcher.compileSourceRoots}" default-value="${project.compileSourceRoots}" * @required * @since 1.0.0 */ @@ -110,7 +117,7 @@ /** * Repertoires des fichiers sources de test a traiter. * - * @parameter expression="${helper.testCompileSourceRoots}" default-value="${project.testCompileSourceRoots}" + * @parameter expression="${license-switcher.testCompileSourceRoots}" default-value="${project.testCompileSourceRoots}" * @required * @since 1.0.0 */ @@ -118,7 +125,7 @@ /** * Repertoire de sortie des classes (classpath). * - * @parameter expression="${helper.outputDirectory}" default-value="${project.build.outputDirectory}" + * @parameter expression="${license-switcher.outputDirectory}" default-value="${project.build.outputDirectory}" * @required * @since 1.0.0 */ @@ -126,7 +133,7 @@ /** * Repertoire du build des tests * - * @parameter expression="${helper.testOutputDirectory}" default-value="${project.build.testOutputDirectory}" + * @parameter expression="${license-switcher.testOutputDirectory}" default-value="${project.build.testOutputDirectory}" * @required * @since 1.0.0 */ @@ -134,17 +141,24 @@ /** * Un resolver externe * - * @parameter expression="${helper.extraResolver}" + * @parameter expression="${license-switcher.extraResolver}" * @since 1.0.0 */ protected String[] extraResolver; /** * Un flag pour conserver un backup des fichiers modifies. * - * @parameter expression="${helper.keepBackup}" default-value="false" + * @parameter expression="${license-switcher.keepBackup}" default-value="false" * @since 1.0.0 */ protected boolean keepBackup; + /** + * Un flag pour activer le mode verbeux. + * + * @parameter expression="${license-switcher.verbose}" default-value="${maven.verbose}" + * @since 1.0.0 + */ + protected boolean verbose; /** le header a ajouter dans chaque fichier source java */ protected String licenseHeaderContent; /** la liste des chemin relatifs des sources java a traiter pour chaque repertoire contenant des sources */ @@ -164,14 +178,12 @@ @Override public boolean init() throws IOException { - boolean doGenerate = force; - timestamp = System.nanoTime(); // obtain all java source files to be treated javaFilesToTreate = getFilesToTreate(); - doGenerate &= !javaFilesToTreate.isEmpty(); + boolean doGenerate = !javaFilesToTreate.isEmpty(); if (doGenerate) { @@ -211,7 +223,7 @@ Map<File, String[]> files = new java.util.HashMap<File, String[]>(); - MirroredFileUpdater updater = FileUpdaterHelper.newJavaFileUpdater(); + MirroredFileUpdater updater = force ? null : FileUpdaterHelper.newJavaFileUpdater(); updater.setDestinationDirectory(outputDirectory); getFilesToTreateForRoots(new String[]{"**\\/*.java"}, null, compileSourceRoots, files, updater); @@ -267,7 +279,7 @@ getLog().info("process file " + sourceFile); } - // file where to write result + // file where to writeFile result File processFile = new File(sourceFile.getAbsolutePath() + "_" + timestamp); try { @@ -300,13 +312,33 @@ getLog().warn("no license was found on file " + sourceFile + ", adding one"); String content = FileUtil.readAsString(sourceFile, encoding); content = "/**\n * " + LicenseFilter.HEADER + " " + licenseHeaderContent + " " + LicenseFilter.FOOTER + "\n */\n" + content; - FileUtil.writeString(processFile, content, encoding); + writeFile(processFile, content, encoding); } protected void addLicenseToXmlSourceFile(File sourceFile, File processFile) throws IOException { getLog().warn("no license was found on file " + sourceFile + ", adding one"); String content = FileUtil.readAsString(sourceFile, encoding); content = "<!--\n\n/**\n * " + LicenseFilter.HEADER + " " + licenseHeaderContent + " " + LicenseFilter.FOOTER + "\n */\n" + content + " \n\n-->"; - FileUtil.writeString(processFile, content, encoding); + writeFile(processFile, content, encoding); } + + @Override + public boolean isVerbose() { + return verbose; + } + + @Override + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + public MavenProject getProject() { + return project; + } + + @Override + public void setProject(MavenProject project) { + this.project = project; + } } Modified: maven-license-switcher-plugin/trunk/src/site/site.xml =================================================================== --- maven-license-switcher-plugin/trunk/src/site/site.xml 2009-05-13 15:31:20 UTC (rev 1534) +++ maven-license-switcher-plugin/trunk/src/site/site.xml 2009-05-13 20:10:26 UTC (rev 1535) @@ -29,36 +29,27 @@ <body> <links> <item name="Labs" href="http://labs.libre-entreprise.org"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="${project.organization.name}" href="${project.organization.url}"/> </links> <menu name="Utilisateur"> <item name="Introduction" href="index.html"/> - <item name="Goals" href="plugin-info.html"> - <item name="license" href="license-mojo.html"/> - <item name="third-party" href="third-party-mojo.html"/> + <item name="Goals" href="plugin-info.html"> <item name="switch" href="switch-mojo.html"/> - <item name="available-licenses" href="available-licenses-mojo.html"/> <item name="help" href="help-mojo.html"/> </item> - <item name="Usage" href="usage.html"/> - <item name="FAQ" href="faq.html"/> </menu> - <menu name="Examples"> - <item name="Todo" href="Todo.html"/> - </menu> - + <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" - name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" - name="Voir toutes les versions"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> </menu> - <menu name="Développeur"> - <item name="A faire" href="Todo.html"/> - </menu> - <menu ref="reports"/> </body>