- Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r1432 - maven-license-switcher-plugin/tags
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:52:49 +0000 (Mon, 20 Apr 2009) New Revision: 1432 Added: maven-license-switcher-plugin/tags/0.7/ Log: [maven-release-plugin] copy for tag 0.7 Copied: maven-license-switcher-plugin/tags/0.7 (from rev 1431, maven-license-switcher-plugin/trunk)

1 0

[Lutinutil-commits] r1431 - maven-license-switcher-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:52:27 +0000 (Mon, 20 Apr 2009) New Revision: 1431 Modified: maven-license-switcher-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.7 Modified: maven-license-switcher-plugin/trunk/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2009-04-20 10:50:39 UTC (rev 1430) +++ maven-license-switcher-plugin/trunk/pom.xml 2009-04-20 10:52:27 UTC (rev 1431) @@ -14,7 +14,7 @@ <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7</version> <dependencies> @@ -170,9 +170,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.7</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.7</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-license-s…</url> </scm>

1 0

[Lutinutil-commits] r1430 - in maven-license-switcher-plugin/trunk: . src/main/java/org/codelutin/license src/main/java/org/codelutin/license/plugin src/main/java/org/codelutin/license/plugin/impl src/site src/site/rst src/test/java/org/codelutin/license/plugin src/test/java/org/codelutin/license/plugin/impl
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:50:39 +0000 (Mon, 20 Apr 2009) New Revision: 1430 Added: maven-license-switcher-plugin/trunk/src/site/rst/ maven-license-switcher-plugin/trunk/src/site/rst/Todo.rst maven-license-switcher-plugin/trunk/src/site/rst/index.rst Modified: maven-license-switcher-plugin/trunk/changelog.txt maven-license-switcher-plugin/trunk/pom.xml maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/LicenseGenerator.java maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AbstractLicensePlugin.java maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AvailableLicensesPlugin.java maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/LicensePlugin.java maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/SwitchLicensePlugin.java maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/ThirdPartyPlugin.java maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/BasePluginTestCase.java maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/impl/LicensePluginTest.java Log: bump versions, clean code, use doxia-module-jrst Modified: maven-license-switcher-plugin/trunk/changelog.txt =================================================================== --- maven-license-switcher-plugin/trunk/changelog.txt 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/changelog.txt 2009-04-20 10:50:39 UTC (rev 1430) @@ -1,4 +1,5 @@ 0.6 chemit 20090218 + * 20090420 [chemit] clean code, use latest versions, use doxia-module-jrst instead of maven-jrst-plugin * 20090217 [chemit] use project.build.sourceEncoding instead of maven.compile.encoding as default encoding * 20081210 [chemit] use lutinproject 3.4 Modified: maven-license-switcher-plugin/trunk/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/pom.xml 2009-04-20 10:50:39 UTC (rev 1430) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.3</version> </parent> <artifactId>maven-license-switcher-plugin</artifactId> @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> - <version>1.1</version> + <version>1.2</version> </dependency>  @@ -89,9 +89,9 @@ <labs.project>lutinutil</labs.project> <processor.version>0.17</processor.version> - <lutinpluginutil.version>0.3</lutinpluginutil.version> + <lutinpluginutil.version>0.4</lutinpluginutil.version> - <maven.version>2.0.9</maven.version> + <maven.version>2.0.10</maven.version> </properties> @@ -104,7 +104,6 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> <executions> <execution> <goals> @@ -137,21 +136,20 @@ </execution> </executions> </plugin> -  +  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> + <artifactId>maven-site-plugin</artifactId> <configuration> - <defaultLocale>fr</defaultLocale> + <locales>fr</locales> + <siteDirectory>src/site</siteDirectory> </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/LicenseGenerator.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/LicenseGenerator.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/LicenseGenerator.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -1,7 +1,5 @@ package org.codelutin.license; -import java.io.File; - /** * A simple Contract to generate a new header for a given type of file * Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AbstractLicensePlugin.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AbstractLicensePlugin.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AbstractLicensePlugin.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -106,6 +106,7 @@ */ protected File pomFile; + @Override public void execute() throws MojoExecutionException, MojoFailureException { try { Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AvailableLicensesPlugin.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AvailableLicensesPlugin.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/AvailableLicensesPlugin.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -41,6 +41,7 @@ */ protected String extraResolver; + @Override public void execute() throws MojoExecutionException, MojoFailureException { StringBuilder sb = new StringBuilder(); sb.append("Available licenses :\n"); Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/LicensePlugin.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/LicensePlugin.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/LicensePlugin.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -68,6 +68,7 @@ return project != null && ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())); } + @Override protected boolean init() throws Exception { // must generate if file does not exist @@ -90,6 +91,7 @@ return doGenerate; } + @Override protected void doAction() throws Exception { getLog().info("using licence [" + licenseName + "]"); @@ -124,40 +126,6 @@ } } - /*@Override - public void execute() throws MojoExecutionException, MojoFailureException { - - super.execute(); - - if (doGenerate) { - - getLog().info("using licence [" + licenseName + "]"); - - if (verbose) { - getLog().info("licence : " + license); - } - - if (licenseFile.exists() && keepBackup) { - if (verbose) { - getLog().info("backup " + licenseFile); - } - // copy it to backup file - File backup = new File(licenseFile.getAbsolutePath() + "~"); - licenseFile.renameTo(backup); - } - try { - FileUtil.writeString(licenseFile, license.getLicenseContent(encoding), encoding); - - } catch (IOException e) { - throw new MojoExecutionException("could not write license file " + licenseFile + " for reason : " + e.getMessage(), e); - } - } - - // copy LICENSE.txt to classpath - copyFileToOutputDirectory(licenseFile); - }*/ - - public File getLicenseFile() { return licenseFile; } Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/SwitchLicensePlugin.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/SwitchLicensePlugin.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/SwitchLicensePlugin.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -138,6 +138,7 @@ return "pom".equals(project.getPackaging()) || "site".equals(project.getPackaging()); } + @Override protected boolean init() throws IOException { boolean doGenerate = force; @@ -184,34 +185,6 @@ } } - /*@Override - public void execute() throws MojoExecutionException, MojoFailureException { - - super.execute(); - - - - if (javaFilesToTreate.isEmpty()) { - getLog().warn("no java source files found to be treated."); - return; - } - - // create a licence processor with given header - LicenseProcessor p = new LicenseProcessor(licenseHeaderContent); - - for (Entry<File, String[]> entry : javaFilesToTreate.entrySet()) { - File src = entry.getKey(); - for (String javaRelativePath : entry.getValue()) { - File sourceFile = new File(src, javaRelativePath); - try { - processJavaSource(p, sourceFile); - } catch (Exception e) { - throw new MojoExecutionException("could not treate java source file " + sourceFile + " for reason : " + e.getMessage(), e); - } - } - } - }*/ - protected Map<File, String[]> getFilesToTreate() { // init directory scanner Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/ThirdPartyPlugin.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/ThirdPartyPlugin.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/impl/ThirdPartyPlugin.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -129,6 +129,7 @@ return "pom".equals(project.getPackaging()) || "site".equals(project.getPackaging()); } + @Override protected boolean init() throws Exception { boolean doGenerate = false; @@ -184,31 +185,6 @@ } } - /*@Override - public void execute() throws MojoExecutionException, MojoFailureException { - - super.execute(); - - if (doGenerate) { - if (verbose) { - getLog().info("writing third-party file : " + thirdPartyFile); - } - if (keepBackup && thirdPartyFile.exists()) { - if (verbose) { - getLog().info("backup " + thirdPartyFile); - } - thirdPartyFile.renameTo(new File(thirdPartyFile.getAbsolutePath() + '~')); - } - try { - FileUtil.writeString(thirdPartyFile, thirdPartyFileContent, encoding); - } catch (IOException e) { - throw new MojoExecutionException("could not write file " + thirdPartyFile + " for reason : " + e.getMessage(), e); - } - } - - }*/ - - /** @return resolve the dependency tree */ protected DependencyNode resolveProject() { try { Copied: maven-license-switcher-plugin/trunk/src/site/rst/Todo.rst (from rev 1387, maven-license-switcher-plugin/trunk/src/site/fr/rst/Todo.rst) =================================================================== --- maven-license-switcher-plugin/trunk/src/site/rst/Todo.rst (rev 0) +++ maven-license-switcher-plugin/trunk/src/site/rst/Todo.rst 2009-04-20 10:50:39 UTC (rev 1430) @@ -0,0 +1,4 @@ +TODO +==== + +Any idea ? Property changes on: maven-license-switcher-plugin/trunk/src/site/rst/Todo.rst ___________________________________________________________________ Name: svn:mergeinfo + Copied: maven-license-switcher-plugin/trunk/src/site/rst/index.rst (from rev 1387, maven-license-switcher-plugin/trunk/src/site/fr/rst/index.rst) =================================================================== --- maven-license-switcher-plugin/trunk/src/site/rst/index.rst (rev 0) +++ maven-license-switcher-plugin/trunk/src/site/rst/index.rst 2009-04-20 10:50:39 UTC (rev 1430) @@ -0,0 +1,45 @@ +Introduction +------------ + +Maven license-switcher Plugin +============================= + +The Maven License Switcher Plugin is used to switch the license on java sources of a maven module. + +Goals Overview +~~~~~~~~~~~~~~ + +The plugin has the following goals: + + * `license-switcher license`_ add license file and third-party files to classpath (generate them if necessary). + + * `license-switcher third-party`_ write the licenses of all third-party libraries used in project. + + * `license-switcher switch`_ parse Java sources and switch license header. + + * `license-switcher help`_ display help about the plugin (goals, usage). + + * `license-switcher available-licenses`_ display the known licenses of the plugin. + +Usage +~~~~~ + + Instructions on how to use the Plugin can be found on `usage page`_ + +Examples +~~~~~~~~ + + to be done. + +.. _license-switcher license: license-mojo.html + +.. _license-switcher third-party: third-party-mojo.html + +.. _license-switcher switch: switch-mojo.html + +.. _license-switcher help: help-mojo.html + +.. _license-switcher available-licenses: available-licenses-mojo.html + +.. _usage page: usage.html + \ No newline at end of file Modified: maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/BasePluginTestCase.java =================================================================== --- maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/BasePluginTestCase.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/BasePluginTestCase.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -1,6 +1,5 @@ package org.codelutin.license.plugin; -import org.apache.commons.logging.Log; import org.apache.maven.plugin.Mojo; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.junit.Before; @@ -77,7 +76,7 @@ } - private static class MyAbstractMojoTestCase extends AbstractMojoTestCase { + public static class MyAbstractMojoTestCase extends AbstractMojoTestCase { @Override public Mojo lookupMojo(String goal, File pom) throws Exception { Modified: maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/impl/LicensePluginTest.java =================================================================== --- maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/impl/LicensePluginTest.java 2009-04-20 10:50:35 UTC (rev 1429) +++ maven-license-switcher-plugin/trunk/src/test/java/org/codelutin/license/plugin/impl/LicensePluginTest.java 2009-04-20 10:50:39 UTC (rev 1430) @@ -28,6 +28,7 @@ } @Before + @Override public void setUp() throws Exception { super.setUp(); LicensePlugin plugin = (LicensePlugin) mojo;

1 0

[Lutinutil-commits] r1429 - maven-license-switcher-plugin/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:50:35 +0000 (Mon, 20 Apr 2009) New Revision: 1429 Removed: maven-license-switcher-plugin/trunk/src/site/fr/ Log: bump versions, clean code, use doxia-module-jrst

1 0

[Lutinutil-commits] r1428 - lutinpluginutil/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:38:42 +0000 (Mon, 20 Apr 2009) New Revision: 1428 Modified: lutinpluginutil/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: lutinpluginutil/trunk/pom.xml =================================================================== --- lutinpluginutil/trunk/pom.xml 2009-04-20 10:38:39 UTC (rev 1427) +++ lutinpluginutil/trunk/pom.xml 2009-04-20 10:38:42 UTC (rev 1428) @@ -15,7 +15,7 @@ <artifactId>lutinpluginutil</artifactId> - <version>0.4</version> + <version>0.5-SNAPSHOT</version> <dependencies> @@ -89,9 +89,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/lutinpluginutil/tags/0.4</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/lutinpluginutil/tags/0.4</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinpluginutil…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/lutinpluginutil/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/lutinpluginutil/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinpluginutil…</url> </scm>

1 0

[Lutinutil-commits] r1427 - lutinpluginutil/tags
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:38:39 +0000 (Mon, 20 Apr 2009) New Revision: 1427 Added: lutinpluginutil/tags/0.4/ Log: [maven-release-plugin] copy for tag 0.4 Copied: lutinpluginutil/tags/0.4 (from rev 1426, lutinpluginutil/trunk)

1 0

[Lutinutil-commits] r1426 - lutinpluginutil/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:38:08 +0000 (Mon, 20 Apr 2009) New Revision: 1426 Modified: lutinpluginutil/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.4 Modified: lutinpluginutil/trunk/pom.xml =================================================================== --- lutinpluginutil/trunk/pom.xml 2009-04-20 10:37:41 UTC (rev 1425) +++ lutinpluginutil/trunk/pom.xml 2009-04-20 10:38:08 UTC (rev 1426) @@ -15,7 +15,7 @@ <artifactId>lutinpluginutil</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.4</version> <dependencies> @@ -89,9 +89,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/lutinpluginutil/tags/0.4</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/lutinpluginutil/tags/0.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinpluginutil…</url> </scm>

1 0

[Lutinutil-commits] r1425 - lutinpluginutil/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:37:41 +0000 (Mon, 20 Apr 2009) New Revision: 1425 Modified: lutinpluginutil/trunk/changelog.txt Log: bump versions Modified: lutinpluginutil/trunk/changelog.txt =================================================================== --- lutinpluginutil/trunk/changelog.txt 2009-04-20 10:37:22 UTC (rev 1424) +++ lutinpluginutil/trunk/changelog.txt 2009-04-20 10:37:41 UTC (rev 1425) @@ -1,4 +1,4 @@ -0.4 ??? 200904?? +0.4 chemit 20090420 * 20090417 [chemit] - use lutinproject 3.5.3 - use doxia-module-jrst instead on maven-jrst-plugin

1 0

[Lutinutil-commits] r1424 - lutinpluginutil/trunk
by tchemit＠users.labs.libre-entreprise.org 20 Apr '09

20 Apr '09

Author: tchemit Date: 2009-04-20 10:37:22 +0000 (Mon, 20 Apr 2009) New Revision: 1424 Modified: lutinpluginutil/trunk/changelog.txt lutinpluginutil/trunk/pom.xml Log: bump versions Modified: lutinpluginutil/trunk/changelog.txt =================================================================== --- lutinpluginutil/trunk/changelog.txt 2009-04-17 09:08:13 UTC (rev 1423) +++ lutinpluginutil/trunk/changelog.txt 2009-04-20 10:37:22 UTC (rev 1424) @@ -1,5 +1,5 @@ 0.4 ??? 200904?? - * 20090417 [chemit] - use lutinproject 3.5.xx + * 20090417 [chemit] - use lutinproject 3.5.3 - use doxia-module-jrst instead on maven-jrst-plugin 0.3 chemit 20090218 Modified: lutinpluginutil/trunk/pom.xml =================================================================== --- lutinpluginutil/trunk/pom.xml 2009-04-17 09:08:13 UTC (rev 1423) +++ lutinpluginutil/trunk/pom.xml 2009-04-20 10:37:22 UTC (rev 1424) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.5.2</version> + <version>3.5.3</version> </parent> <artifactId>lutinpluginutil</artifactId>

1 0

[Lutinutil-commits] r1423 - in maven-i18n-plugin/trunk: . src/main/java/org/codelutin/i18n/plugin src/main/java/org/codelutin/i18n/plugin/parser src/site src/site/rst
by tchemit＠users.labs.libre-entreprise.org 17 Apr '09

17 Apr '09

Author: tchemit Date: 2009-04-17 09:08:13 +0000 (Fri, 17 Apr 2009) New Revision: 1423 Added: maven-i18n-plugin/trunk/src/site/rst/ maven-i18n-plugin/trunk/src/site/rst/Todo.rst maven-i18n-plugin/trunk/src/site/rst/index.rst Modified: maven-i18n-plugin/trunk/changelog.txt maven-i18n-plugin/trunk/pom.xml maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java maven-i18n-plugin/trunk/src/site/site.xml Log: - replace bundles paramters from tyep String[] to String type to make easier configuration - use lutinproject 3.5.xx - use lutinpluginutil 0.4 Modified: maven-i18n-plugin/trunk/changelog.txt =================================================================== --- maven-i18n-plugin/trunk/changelog.txt 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/changelog.txt 2009-04-17 09:08:13 UTC (rev 1423) @@ -1,3 +1,8 @@ +0.11 chemit 20090311 + * 20090417 [chemit] - replace bundles paramters from tyep String[] to String type to make easier configuration + - use lutinproject 3.5.xx + - use lutinpluginutil 0.4 + 0.10 chemit 20090311 * 20090223 [chemit] will skip get and gen goal if no getters were registred while parsing goals 0.9 chemit 20090218 Modified: maven-i18n-plugin/trunk/pom.xml =================================================================== --- maven-i18n-plugin/trunk/pom.xml 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/pom.xml 2009-04-17 09:08:13 UTC (rev 1423) @@ -9,7 +9,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.2</version> </parent> <artifactId>maven-i18n-plugin</artifactId> @@ -46,7 +46,7 @@ <scope>compile</scope> </dependency> - <dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven.version}</version> @@ -88,7 +88,7 @@ <maven.version>2.0.10</maven.version> <processor.version>0.17</processor.version> - <lutinpluginutil.version>0.3</lutinpluginutil.version> + <lutinpluginutil.version>0.4-SNAPSHOT</lutinpluginutil.version> </properties> <build> @@ -99,7 +99,6 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> <executions> <execution> <goals> @@ -109,21 +108,20 @@ </executions> </plugin> -  +  <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> + <artifactId>maven-site-plugin</artifactId> <configuration> - <defaultLocale>fr</defaultLocale> + <locales>fr</locales> + <siteDirectory>src/site</siteDirectory> </configuration> - <executions> - <execution> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> </plugin> </plugins> </build> Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/AbstractI18nPlugin.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -15,7 +15,6 @@ * 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.codelutin.i18n.plugin; import org.apache.maven.plugin.AbstractMojo; @@ -23,7 +22,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -38,16 +36,13 @@ * Le nombre de getters détectés pendant le cycle de vie du build. */ private static int NB_GETTER_FILES = 0; - /** * Répertoire de stockage des fichiers i18n pour la recuperation des fichiers * de traduction entre librairie */ protected static final String DIRECTORY_INSTALL = "i18n" + File.separatorChar; - /** les bundles par defaut utilisés, si aucun bundle n'est renseigné. */ - protected static final String[] DEFAULT_BUNDLES = new String[]{"fr_FR", "en_GB"}; - + //protected static final String[] DEFAULT_BUNDLES = new String[]{"fr_FR", "en_GB"}; /** * Nom du projet. * @@ -55,16 +50,14 @@ * @readonly */ protected String artifactId; - /** * Langues des bundles generes. * - * Note: Si aucun bundle n'est definie, on utilise par defaut {@link #DEFAULT_BUNDLES}. * - * @parameter expression="${i18n.bundles}" + * @parameter expression="${i18n.bundles}" default-value="fr_FR,en_GB" + * @required */ - protected String[] bundles = DEFAULT_BUNDLES; - + protected String bundles; /** * Repertoire sources des fichiers i18n. * @@ -72,7 +65,6 @@ * @required */ protected File src; - /** * Repertoire des fichiers generes i18n. * @@ -80,7 +72,6 @@ * @required */ protected File out; - /** * encoding a utiliser pour charger et sauver les bundles * @@ -88,7 +79,6 @@ * @required */ protected String encoding; - /** * Met les fichiers generes dans le repertoire des sources i18n. * @@ -97,7 +87,6 @@ * @parameter expression="${i18n.genSrc}" default-value="true" */ protected boolean genSrc; - /** * Active la modification de cle. * @@ -106,7 +95,6 @@ * @parameter expression="${i18n.keysModifier}" default-value="false" */ protected boolean keysModifier; - /** * verbose flag * @@ -115,7 +103,6 @@ * @parameter expression="${i18n.verbose}" default-value="${maven.verbose}" */ protected boolean verbose; - /** * conserve les anciens fichiers de traduction avec un suffix ~ * @@ -124,7 +111,6 @@ * @parameter expression="${i18n.keepBackup}" default-value="false" */ protected boolean keepBackup; - /** * ne conserve que les clef scannees (et donc traite tous les fichiers) * @@ -134,10 +120,9 @@ * @parameter expression="${i18n.strictMode}" default-value="false" */ protected boolean strictMode; - /** Liste des évènements */ protected List<ParserEvent> events = new ArrayList<ParserEvent>(); - + protected String[] bundlesToUse; /**logger verbeux */ protected I18nLogger verboseLog; @@ -162,16 +147,13 @@ public void init() { verboseLog = new I18nLogger(this); - + if (verbose) { getLog().info("config - verbose mode is on"); } - // set default bundle in none specified - if (bundles == null || bundles.length == 0 || (bundles.length == 1 && (bundles[0] == null || bundles[0].trim().isEmpty()))) { - if (verbose) { - getLog().info("config - use default bundles " + Arrays.toString(DEFAULT_BUNDLES)); - } - bundles = DEFAULT_BUNDLES; + bundlesToUse = bundles.split(","); + for (int i = 0, j = bundlesToUse.length; i < j; i++) { + bundlesToUse[i] = bundlesToUse[i].trim(); } } @@ -184,8 +166,8 @@ * @return <code>true</code> si des getters ont etes enregistres pendant * le cycle de vie, <code>false</code> sinon. */ - protected boolean needGeneration(){ - boolean needGeneration = NB_GETTER_FILES > 0; + protected boolean needGeneration() { + boolean needGeneration = NB_GETTER_FILES > 0; return needGeneration; } @@ -202,5 +184,4 @@ protected I18nLogger getVerboseLog() { return verboseLog; } - } Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Generate.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -51,7 +51,7 @@ return; } - for (String bundle : bundles) { + for (String bundle : bundlesToUse) { try { // Merge File bundleSrc = PluginHelper.getI18nFile(src, artifactId, bundle, false); Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/Getter.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -74,7 +74,7 @@ } // Création des bundles - for (String bundle : bundles) { + for (String bundle : bundlesToUse) { File bundleOut = PluginHelper.getI18nFile(out, artifactId, bundle, false); FileUtil.copy(bundleGetters, bundleOut); if (verbose) { Modified: maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java =================================================================== --- maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/main/java/org/codelutin/i18n/plugin/parser/AbstractI18nParser.java 2009-04-17 09:08:13 UTC (rev 1423) @@ -153,7 +153,7 @@ // Anciennes cles disponnibles //fixme : pourquoi on utilise un bundle precis ? le premier ici, je ne comprends pas - File oldLanguageFile = PluginHelper.getI18nFile(src, artifactId, bundles[0], true); + File oldLanguageFile = PluginHelper.getI18nFile(src, artifactId, bundlesToUse[0], true); oldLanguage.load(oldLanguageFile); Copied: maven-i18n-plugin/trunk/src/site/rst/Todo.rst (from rev 1409, maven-i18n-plugin/trunk/src/site/fr/rst/Todo.rst) =================================================================== --- maven-i18n-plugin/trunk/src/site/rst/Todo.rst (rev 0) +++ maven-i18n-plugin/trunk/src/site/rst/Todo.rst 2009-04-17 09:08:13 UTC (rev 1423) @@ -0,0 +1,4 @@ +TODO +==== + +Any idea ? Property changes on: maven-i18n-plugin/trunk/src/site/rst/Todo.rst ___________________________________________________________________ Name: svn:mergeinfo + Copied: maven-i18n-plugin/trunk/src/site/rst/index.rst (from rev 1409, maven-i18n-plugin/trunk/src/site/fr/rst/index.rst) =================================================================== --- maven-i18n-plugin/trunk/src/site/rst/index.rst (rev 0) +++ maven-i18n-plugin/trunk/src/site/rst/index.rst 2009-04-17 09:08:13 UTC (rev 1423) @@ -0,0 +1,40 @@ +Introduction +------------ + +Maven I18n Plugin +================= + +The Maven I18n Plugin is used to compute i18n bundles for a given maven module. + +Goals Overview +~~~~~~~~~~~~~~ + +The I18n plugin has the following goals: + + * **i18n:parserJava** parse Java sources. + + * **i18n:parserJaxx** parse Jaxx sources. + + * **i18n:parserSwixat** parse Jaxx sources. + + * **i18n:parserValidation** parse XWorks validation sources. + + * **i18n:parserJavaActionConfig** parse des actions jaxx. + + * **i18n:parserJavaTabConfig** parse des onglets jaxx. + + * **i18n:get** assembly getter computed by parser-like goals. + + * **i18n:gen** generate i18n bundle from getters. + + * **i18n:help** display help. + +Usage +~~~~~ + +Instructions on how to use the Help Plugin can be found in **usages** page. + +Examples +~~~~~~~~ + + to be done. Property changes on: maven-i18n-plugin/trunk/src/site/rst/index.rst ___________________________________________________________________ Name: svn:mergeinfo + Modified: maven-i18n-plugin/trunk/src/site/site.xml =================================================================== --- maven-i18n-plugin/trunk/src/site/site.xml 2009-04-17 09:08:10 UTC (rev 1422) +++ maven-i18n-plugin/trunk/src/site/site.xml 2009-04-17 09:08:13 UTC (rev 1423) @@ -40,6 +40,7 @@ <item name="parserSwixat" href="parserSwixat-mojo.html"/> <item name="parserJavaActionConfig" href="parserJavaActionConfig-mojo.html"/> <item name="parserJavaTabConfig" href="parserJavaTabConfig-mojo.html"/> + <item name="parserXWorks" href="parserValidation-mojo.html"/> <item name="get" href="get-mojo.html"/> <item name="gen" href="gen-mojo.html"/> <item name="help" href="help-mojo.html"/>

1 0