- I18n-commits - mailman.cloud.codelutin.com

r1672 - in trunk: . maven-i18n-plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser
by tchemit＠users.nuiton.org 26 Sep '09

26 Sep '09

Author: tchemit Date: 2009-09-26 03:48:41 +0200 (Sat, 26 Sep 2009) New Revision: 1672 Modified: trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java trunk/pom.xml Log: - bump junit, mavenpom and processor versions - fix javadoc plexus javadoc annotation (in plugin module) - fix javadoc - improve dependencies (exclude a lot from maven-helper-plugin) Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2009-09-03 17:58:43 UTC (rev 1671) +++ trunk/maven-i18n-plugin/pom.xml 2009-09-26 01:48:41 UTC (rev 1672) @@ -31,7 +31,6 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <type>maven-plugin</type> </dependency> <dependency> @@ -44,6 +43,10 @@ <artifactId>commons-collections</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </dependency>   <packaging>maven-plugin</packaging> - + <build> <defaultGoal>install</defaultGoal> @@ -112,6 +115,185 @@ </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> <reporting> @@ -119,6 +301,177 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + </plugin> + </plugins> </reporting> Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java 2009-09-03 17:58:43 UTC (rev 1671) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java 2009-09-26 01:48:41 UTC (rev 1672) @@ -28,7 +28,7 @@ public interface ParserEvent { /** - * M�thode appelée quand on change de fichier parsé + * Méthode appelée quand on change de fichier parsé * * @param file */ @@ -50,9 +50,9 @@ public void eventChangeKey(String keyI18n, boolean newKey); /** - * M�thode appelée pour récupérer la nouvelle valeur de clé + * Méthode appelée pour récupérer la nouvelle valeur de clé * - * @return + * @return la nouvelle clé */ public String eventGetRealKey(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 17:58:43 UTC (rev 1671) +++ trunk/pom.xml 2009-09-26 01:48:41 UTC (rev 1672) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>i18n</artifactId> @@ -46,10 +46,90 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> - <type>maven-plugin</type> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + + </exclusions> </dependency> - + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + <version>1.2</version> + </dependency> + <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> <version>2.7.1</version> @@ -66,7 +146,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency> @@ -122,7 +202,7 @@  <projectId>i18n</projectId> - <processor.version>1.0.0</processor.version> + <processor.version>1.0.1-SNAPSHOT</processor.version> </properties>

1 0

r1671 - in trunk: . maven-i18n-plugin nuiton-i18n-api
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 19:58:43 +0200 (Thu, 03 Sep 2009) New Revision: 1671 Modified: trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n-api/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2009-09-03 17:58:39 UTC (rev 1670) +++ trunk/maven-i18n-plugin/pom.xml 2009-09-03 17:58:43 UTC (rev 1671) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n-api/pom.xml =================================================================== --- trunk/nuiton-i18n-api/pom.xml 2009-09-03 17:58:39 UTC (rev 1670) +++ trunk/nuiton-i18n-api/pom.xml 2009-09-03 17:58:43 UTC (rev 1671) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 17:58:39 UTC (rev 1670) +++ trunk/pom.xml 2009-09-03 17:58:43 UTC (rev 1671) @@ -13,7 +13,7 @@ </parent> <artifactId>i18n</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <modules> <module>nuiton-i18n-api</module> @@ -138,9 +138,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-1.0.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-1.0.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-1.0.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> </scm> </project>

1 0

r1670 - tags
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 19:58:39 +0200 (Thu, 03 Sep 2009) New Revision: 1670 Added: tags/i18n-1.0.1/ Log: [maven-scm] copy for tag i18n-1.0.1

1 0

r1669 - in trunk: . maven-i18n-plugin nuiton-i18n-api
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 19:58:34 +0200 (Thu, 03 Sep 2009) New Revision: 1669 Modified: trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n-api/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release i18n-1.0.1 Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2009-09-03 17:32:27 UTC (rev 1668) +++ trunk/maven-i18n-plugin/pom.xml 2009-09-03 17:58:34 UTC (rev 1669) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n-api/pom.xml =================================================================== --- trunk/nuiton-i18n-api/pom.xml 2009-09-03 17:32:27 UTC (rev 1668) +++ trunk/nuiton-i18n-api/pom.xml 2009-09-03 17:58:34 UTC (rev 1669) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 17:32:27 UTC (rev 1668) +++ trunk/pom.xml 2009-09-03 17:58:34 UTC (rev 1669) @@ -13,7 +13,7 @@ </parent> <artifactId>i18n</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <modules> <module>nuiton-i18n-api</module> @@ -138,9 +138,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-1.0.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-1.0.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-1.0.1</url> </scm> </project>

1 0

r1668 - in trunk: maven-i18n-plugin maven-i18n-plugin/src/site/apt nuiton-i18n-api
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 19:32:27 +0200 (Thu, 03 Sep 2009) New Revision: 1668 Added: trunk/maven-i18n-plugin/changelog.txt trunk/nuiton-i18n-api/changelog.txt Modified: trunk/maven-i18n-plugin/src/site/apt/usages.apt Log: improve doc + readd changelog file (when building project as standalone it is not working...) but with an empty content Added: trunk/maven-i18n-plugin/changelog.txt =================================================================== --- trunk/maven-i18n-plugin/changelog.txt (rev 0) +++ trunk/maven-i18n-plugin/changelog.txt 2009-09-03 17:32:27 UTC (rev 1668) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Modified: trunk/maven-i18n-plugin/src/site/apt/usages.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/apt/usages.apt 2009-09-03 17:20:38 UTC (rev 1667) +++ trunk/maven-i18n-plugin/src/site/apt/usages.apt 2009-09-03 17:32:27 UTC (rev 1668) @@ -24,38 +24,24 @@ Here is the directory layout convention used by the plugin ----------------------------------------------------------------------------- +mymodule/ +|-- src +| `-- main +| `-- resources +| `-- i18n +| |-- mymodule-en_GB.properties +| `-- mymodule-fr_FR.properties +`-- target + |-- classes + | `-- META-INF + | |-- mymodule-en_GB.properties + | |-- mymodule-fr_FR.properties + | `-- mymodule-i18n-definition.properties + `-- generated-sources + `-- i18n + |-- mymodule-en_GB.properties + `-- mymodule-fr_FR.properties - mymodule - | - +- src - | | - | +- main - | | - | +- resources - | | - | +- i18n - | | - | +- mymodule-fr_FR.properties - | +- mymodule-en_UK.properties - | - +- target - | - +- classes - | | - | +- META-INF - | | - | +- mymodule-i18n-definition.properties - | +- mymodule-i18n-fr_FR.properties - | +- mymodule-i18n-en_UK.properties - | - +- generated-sources - | - +- i18n - | - +- mymodule-fr_FR.properties - +- mymodule-en_UK.properties - - ----------------------------------------------------------------------------- * Parse files Added: trunk/nuiton-i18n-api/changelog.txt =================================================================== --- trunk/nuiton-i18n-api/changelog.txt (rev 0) +++ trunk/nuiton-i18n-api/changelog.txt 2009-09-03 17:32:27 UTC (rev 1668) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file

1 0

r1667 - in trunk: . maven-i18n-plugin nuiton-i18n-api
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 19:20:38 +0200 (Thu, 03 Sep 2009) New Revision: 1667 Removed: trunk/maven-i18n-plugin/changelog.txt trunk/nuiton-i18n-api/changelog.txt Modified: trunk/changelog.txt Log: keep only one changelog for all the project Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-03 17:08:54 UTC (rev 1666) +++ trunk/changelog.txt 2009-09-03 17:20:38 UTC (rev 1667) @@ -1,9 +1,56 @@ 1.0.1 - * [FIX] #27: les fichiers java ne sont plus détectés - * [FIX] #29: les urls de telechargements ne sont pas ok pour le plugin + * [FIX #27] les fichiers java ne sont plus détectés + * [FIX #29] les urls de telechargements ne sont pas ok pour le plugin + * [FEATURE #41] improve the documentation of the plugin -- chemit -- Thu, 03 Sep 2009 18:51:54 +0200 -1.0.0 xxx xxx - * Initial release (merge of previous lutin projects) \ No newline at end of file +1.0.0 chemit 20090823 + * Initial release (merge of previous lutin projects) + * migrate to groupId org.nuiton + +0.12 chemit 20090511 (maven-i18n-plugin) + * bump versions (lutinproject, lutinprocessor, maven-license-switcher-plugin) + * improve download section on site + * update site + * introduce bundle goal to merge all bundle into one for final application + * no more use of bundles property, prefer locales one (with real Locale object instead of simple String one...) + +0.11 chemit 20090311 (maven-i18n-plugin) + * 20090420 [chemit] - bump versions + * 20090417 [chemit] - replace bundles parameters from tyep String[] to String type to make easier configuration + - use lutinproject 3.5.xx + - use lutinpluginutil 0.4 + +0.10 chemit 20090311 (maven-i18n-plugin) + * 20090223 [chemit] will skip get and gen goal if no getters were registred while parsing goals + +0.9 chemit 20090218 (maven-i18n-plugin) + * 20090217 [chemit] use project.build.sourceEncoding instead of maven.compile.encoding as default encoding + * 20090214 [chemit] add safeMode, showTouchedFiles properties in parser mojo (none safeMode will improve performance) + * 20090205 [chemit] use lutinproject 3.4 + +0.8 chemit 20090107 (maven-i18n-plugin) + * 20081205 [chemit] modify ParserValidation (message can by suffix by ## to delimite args) + +0.7 chemit 20081117 (maven-i18n-plugin) + * 20081205 [chemit] use lutinpluginproject 3.2 + +ver-0-7 chemit 20081117 (maven-i18n-plugin) + * 20081118 [chemit] use lutinpluginproject 3.1 + * 20081026 [chemit] add xworks validator parse + * 20081026 [chemit] improve parser mojo logging + +ver-0-6 thimel 20080922 (maven-i18n-plugin) + * 20080925 [chemit] Using lutinpluginutil 0.2 and license-switcher in pom (no more in superpom) + * 20080922 [thimel] Using lutinpluginproject 3.0 + +ver-0-5 chemit 20080824 (maven-i18n-plugin) + * 20080824 [chemit] refactoring code + unificiation des reader et writer pour que cela fonctionne en utf8 + * 20080824 [chemit] suppresion dependance lutinutil + * 20080824 [chemit] passage du projet en utf8 + * 20080824 [chemit] passage en maven 2 layout directory + +ver-0-4 (maven-i18n-plugin) + * [chemit] pas maintenu avant ! \ No newline at end of file Deleted: trunk/maven-i18n-plugin/changelog.txt =================================================================== --- trunk/maven-i18n-plugin/changelog.txt 2009-09-03 17:08:54 UTC (rev 1666) +++ trunk/maven-i18n-plugin/changelog.txt 2009-09-03 17:20:38 UTC (rev 1667) @@ -1,49 +0,0 @@ -1.0.1 chemit 20090825 - * [FIX] #27 : regex no more compatible with plexus-utils - * [FIX] #29 : urls of plugin download are wrong - * [FEATURE] : improve the documentation of the plugin - -1.0.0 chemit 20090823 - * migrate to groupId org.nuiton - -0.12 chemit 20090511 - * bump versions (lutinproject, lutinprocessor, maven-license-switcher-plugin) - * improve download section on site - * update site - * introduce bundle goal to merge all bundle into one for final application - * no more use of bundles property, prefer locales one (with real Locale object instead of simple String one...) - -0.11 chemit 20090311 - * 20090420 [chemit] - bump versions - * 20090417 [chemit] - replace bundles parameters 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 - * 20090217 [chemit] use project.build.sourceEncoding instead of maven.compile.encoding as default encoding - * 20090214 [chemit] add safeMode, showTouchedFiles properties in parser mojo (none safeMode will improve performance) - * 20090205 [chemit] use lutinproject 3.4 -0.8 chemit 20090107 - * 20081205 [chemit] modify ParserValidation (message can by suffix by ## to delimite args) - -0.7 chemit 20081117 - * 20081205 [chemit] use lutinpluginproject 3.2 -ver-0-7 chemit 20081117 - * 20081118 [chemit] use lutinpluginproject 3.1 - * 20081026 [chemit] add xworks validator parse - * 20081026 [chemit] improve parser mojo logging - -ver-0-6 thimel 20080922 - * 20080925 [chemit] Using lutinpluginutil 0.2 and license-switcher in pom (no more in superpom) - * 20080922 [thimel] Using lutinpluginproject 3.0 - -ver-0-5 chemit 20080824 - * 20080824 [chemit] refactoring code + unificiation des reader et writer pour que cela fonctionne en utf8 - * 20080824 [chemit] suppresion dependance lutinutil - * 20080824 [chemit] passage du projet en utf8 - * 20080824 [chemit] passage en maven 2 layout directory - -ver-0-4 - * [chemit] pas maintenu avant ! Deleted: trunk/nuiton-i18n-api/changelog.txt =================================================================== --- trunk/nuiton-i18n-api/changelog.txt 2009-09-03 17:08:54 UTC (rev 1666) +++ trunk/nuiton-i18n-api/changelog.txt 2009-09-03 17:20:38 UTC (rev 1667) @@ -1,2 +0,0 @@ -1.0.0 ? - * initial release

1 0

r1666 - trunk
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 19:08:54 +0200 (Thu, 03 Sep 2009) New Revision: 1666 Modified: trunk/changelog.txt trunk/pom.xml Log: update changelog bump versions Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-08-25 22:27:56 UTC (rev 1665) +++ trunk/changelog.txt 2009-09-03 17:08:54 UTC (rev 1666) @@ -1,2 +1,9 @@ +1.0.1 + + * [FIX] #27: les fichiers java ne sont plus détectés + * [FIX] #29: les urls de telechargements ne sont pas ok pour le plugin + +-- chemit -- Thu, 03 Sep 2009 18:51:54 +0200 + 1.0.0 xxx xxx * Initial release (merge of previous lutin projects) \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-25 22:27:56 UTC (rev 1665) +++ trunk/pom.xml 2009-09-03 17:08:54 UTC (rev 1666) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <artifactId>i18n</artifactId>

1 0

r1665 - trunk
by tchemit＠users.nuiton.org 25 Aug '09

25 Aug '09

Author: tchemit Date: 2009-08-26 00:27:56 +0200 (Wed, 26 Aug 2009) New Revision: 1665 Modified: trunk/pom.xml Log: update mavenpom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-25 22:27:35 UTC (rev 1664) +++ trunk/pom.xml 2009-08-25 22:27:56 UTC (rev 1665) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <artifactId>i18n</artifactId>

1 0

r1664 - trunk/src/site
by tchemit＠users.nuiton.org 25 Aug '09

25 Aug '09

Author: tchemit Date: 2009-08-26 00:27:35 +0200 (Wed, 26 Aug 2009) New Revision: 1664 Modified: trunk/src/site/site.xml Log: - improve docs Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-25 22:26:47 UTC (rev 1663) +++ trunk/src/site/site.xml 2009-08-25 22:27:35 UTC (rev 1664) @@ -1,24 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> </poweredBy>

1 0

r1663 - in trunk/maven-i18n-plugin: . src/site/apt
by tchemit＠users.nuiton.org 25 Aug '09

25 Aug '09

Author: tchemit Date: 2009-08-26 00:26:47 +0200 (Wed, 26 Aug 2009) New Revision: 1663 Modified: trunk/maven-i18n-plugin/changelog.txt trunk/maven-i18n-plugin/src/site/apt/usages.apt Log: - improve docs - update changelog Modified: trunk/maven-i18n-plugin/changelog.txt =================================================================== --- trunk/maven-i18n-plugin/changelog.txt 2009-08-25 22:26:12 UTC (rev 1662) +++ trunk/maven-i18n-plugin/changelog.txt 2009-08-25 22:26:47 UTC (rev 1663) @@ -1,4 +1,9 @@ -1.0.0 ? +1.0.1 chemit 20090825 + * [FIX] #27 : regex no more compatible with plexus-utils + * [FIX] #29 : urls of plugin download are wrong + * [FEATURE] : improve the documentation of the plugin + +1.0.0 chemit 20090823 * migrate to groupId org.nuiton 0.12 chemit 20090511 Modified: trunk/maven-i18n-plugin/src/site/apt/usages.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/apt/usages.apt 2009-08-25 22:26:12 UTC (rev 1662) +++ trunk/maven-i18n-plugin/src/site/apt/usages.apt 2009-08-25 22:26:47 UTC (rev 1663) @@ -5,4 +5,229 @@ 2009-08-22 ---- - <To be done...> \ No newline at end of file +How it works + + The i18n plugin works in at least two phases : + + * first, it parses some sources to build for each bundle a called <getter> file + which contains all keys found in sources. + + * in a second time, the <getter> files are merged with the existing translations + files. + + * at last, we can make a optimized bundle which merge the module i18n with all + his dependencies (this is good idea when the module is a final application... + see below section) + +* directory layout + + Here is the directory layout convention used by the plugin + +----------------------------------------------------------------------------- + + mymodule + | + +- src + | | + | +- main + | | + | +- resources + | | + | +- i18n + | | + | +- mymodule-fr_FR.properties + | +- mymodule-en_UK.properties + | + +- target + | + +- classes + | | + | +- META-INF + | | + | +- mymodule-i18n-definition.properties + | +- mymodule-i18n-fr_FR.properties + | +- mymodule-i18n-en_UK.properties + | + +- generated-sources + | + +- i18n + | + +- mymodule-fr_FR.properties + +- mymodule-en_UK.properties + + +----------------------------------------------------------------------------- + +* Parse files + + The plugin offers some build-in parsers, each parser has his goal prefix by <parser> : + + * parserJava : parse some java source files to detect <I18n._> and <I18n.n_> invocations in code + + * parserJaxx : parse some {{{http://maven-site.nuiton.org/jaxx}jaxx}} files. This goal is deprecated + + * parserSwixat : parse some swixat files + + * parserValidation : parse some xWorks validation files + + Each parser goal has some default values, if you respect the plugin conventions, + you should have nothing to configure. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + + will parse all java files in <src/main/java> and will generate the <getter> files + in <target/generated-sources/i18n>. + + Moreover, it is possible to defined more directories to be scanned, like in next + example, where we also scan the <src/main/java2> : + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>src/main/java2/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + + The entries can be more complex. + + For example, it is possible to filter via some includes/excludes, or + attach the entry only for a specific parser via the <specificGoal> property. + + When using an entry, the default entry for the parser is not used, but it can + be activated via the <treateDefaultEntry> property. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <treateDefaultEntry>true</treateDefaultEntry> + <entries> + <entry> + <basedir>src/main/java2/</basedir> + <includes> + <include>**/*.guix</include> + </includes> + <specificGoal>parserJaxx</specificGoal> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserJaxx</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + + + Consult the javadoc of the <org.nuiton.util.SourceEntry> class in + {{{http://maven-site.nuiton.org/maven-helper-plugin/apidocs/index.html}maven-helper-plugin}} + library. + +* Build bundles + + After the files were parsed, it is time to build the i18n bundles of the module. + + * The default location of those files are in <src/main/resources/i18n>. + + * The default file names of the bundles are <artifactId-bundle.properties> + +** The gen goal + + the <gen> goal rebuild those files, using the getter files previously builded. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>gen</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + +** The bundle goal + + The <bundle> goal build the bundles for a final application which aggregate + all i18n bundles of all dependencies of the module. + + This is a good idea to do it, since the loading of the runtime <i18n> system + is much more faster with only one file to deal with. + + The final bundles builded will be placed directly in <target/classes/META-INF> since + this is an only runtime bundle and it should never to add in module's sources. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + +* All in one + + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + +And there is more for you! + + There is some other interesting properties in the plugin, for example it is + possible to translate the new i18n key detected while parsing via a swing ui. + + To see all the features of the plugin, consult the + {{{plugin-info.html}goals details}} page.

1 0