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

30 Mar '10

Author: tchemit Date: 2010-03-30 22:35:54 +0200 (Tue, 30 Mar 2010) New Revision: 1731 Log: Evolution #426: Add integration tests Added: trunk/maven-i18n-plugin/src/it/ trunk/maven-i18n-plugin/src/it/parsers/ trunk/maven-i18n-plugin/src/it/parsers/newProject/ trunk/maven-i18n-plugin/src/it/parsers/newProject/LICENSE.txt trunk/maven-i18n-plugin/src/it/parsers/newProject/README.txt trunk/maven-i18n-plugin/src/it/parsers/newProject/changelog.txt trunk/maven-i18n-plugin/src/it/parsers/newProject/invoker.properties trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/src/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/test/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/LICENSE.txt trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/README.txt trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/changelog.txt trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/invoker.properties trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/it/settings.xml Modified: trunk/maven-i18n-plugin/pom.xml Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-03-28 21:39:04 UTC (rev 1730) +++ trunk/maven-i18n-plugin/pom.xml 2010-03-30 20:35:54 UTC (rev 1731) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +13,7 @@ <artifactId>i18n</artifactId> <version>1.2.1-SNAPSHOT</version> </parent> - + <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> @@ -78,7 +80,7 @@ <artifactId>plexus-utils</artifactId> </dependency> - <dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>runtime</scope> @@ -91,11 +93,12 @@  <name>I18n :: Maven Plugin</name> <description> - Plugin pour maven 2 de génération des bundles pour l'internationalisation (i18n) des applications java + Plugin pour maven 2 de génération des bundles pour + l'internationalisation (i18n) des applications java basé sur nuiton-i18n-api. </description> <inceptionYear>2007</inceptionYear> - +    @@ -103,7 +106,6 @@ <packaging>maven-plugin</packaging> <build> - <defaultGoal>install</defaultGoal> <plugins> @@ -118,7 +120,7 @@ </execution> </executions> </plugin> - + </plugins> </build> @@ -127,8 +129,48 @@ <plugins> <plugin> <artifactId>maven-plugin-plugin</artifactId> - </plugin> + </plugin> </plugins> </reporting> + <profiles> + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <pomIncludes> + <pomInclude>**/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> +  + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/LICENSE.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/LICENSE.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/LICENSE.txt 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/README.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/README.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/README.txt 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,2 @@ +To test parserJava on a new project (says a project with no i18n translations) +At the end we should have in target/generated-sources/i18n getters detected. Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/changelog.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/changelog.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/changelog.txt 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/invoker.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/invoker.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/invoker.properties 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean process-resources + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>@pom.version@</version> + </parent> + + <artifactId>parsers-newProject</artifactId> + +  +  +  + + <name>I18n Test :: parsers-new</name> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + <i18nVersion>@pom.version@</i18nVersion> + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + </properties> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18nVersion}</version> + +  + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + + Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,11 @@ +package org.nuiton.i18n.test; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +public class MyBean { + + protected String field1 = n_("javaGetter.key1"); + + protected String field2 = _("javaGetter.key2"); +} Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="field1"> + + <field-validator type="required"> + <message>validationGetter.key1</message> + </field-validator> + + </field> + + <field name="field2"> + + <field-validator type="required"> + <message>validationGetter.key2##${parm1}</message> + </field-validator> + + </field> + +</validators> Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,16 @@ + +file = new File(basedir, 'target/generated-sources/i18n/java.getter'); +assert file.exists(); + +content = file.text; +assert content.contains( 'javaGetter.key1=' ); +assert content.contains( 'javaGetter.key2=' ); + +file = new File(basedir, 'target/generated-sources/i18n/validation.getter'); +assert file.exists(); + +content = file.text; +assert content.contains( 'validationGetter.key1=' ); +assert content.contains( 'validationGetter.key2=' ); + +return true; Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/LICENSE.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/LICENSE.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/LICENSE.txt 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/README.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/README.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/README.txt 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,2 @@ +To test parsers on a i18n project (says a project with some i18n translations) +At the end we should have in target/generated-sources/i18n getters detected. Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/changelog.txt =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/changelog.txt (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/changelog.txt 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/invoker.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/invoker.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/invoker.properties 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean process-resources + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>@pom.version@</version> + </parent> + + <artifactId>parsers-withNewKeys</artifactId> + +  +  +  + + <name>I18n Test :: parsers-new</name> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + <i18nVersion>@pom.version@</i18nVersion> + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + </properties> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18nVersion}</version> + <configuration> + <keepGetters>true</keepGetters> + </configuration> +  + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + + Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,11 @@ +package org.nuiton.i18n.test; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +public class MyBean { + + protected String field1 = n_("javaGetter.key1"); + + protected String field2 = _("javaGetter.key2"); +} Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,2 @@ +javaGetter.old.key1=hum1 +javaGetter.old.key2=hum2 Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="field1"> + + <field-validator type="required"> + <message>validationGetter.key1</message> + </field-validator> + + </field> + + <field name="field2"> + + <field-validator type="required"> + <message>validationGetter.key2##${parm1}</message> + </field-validator> + + </field> + +</validators> Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,29 @@ + +file = new File(basedir, 'target/generated-sources/i18n/java.getter'); +assert file.exists(); + +content = file.text; +//assert content.contains( 'javaGetter.old.key1=' ); +//assert content.contains( 'javaGetter.old.key2=' ); +assert content.contains( 'javaGetter.key1=' ); +assert content.contains( 'javaGetter.key2=' ); + +file = new File(basedir, 'target/generated-sources/i18n/validation.getter'); +assert file.exists(); + +content = file.text; +assert content.contains( 'validationGetter.key1=' ); +assert content.contains( 'validationGetter.key2=' ); + +file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties'); +assert file.exists(); + +content = file.text; +assert content.contains( 'javaGetter.old.key1=' ); +assert content.contains( 'javaGetter.old.key2=' ); +assert content.contains( 'javaGetter.key1=' ); +assert content.contains( 'javaGetter.key2=' ); +assert content.contains( 'validationGetter.key1=' ); +assert content.contains( 'validationGetter.key2=' ); + +return true; Added: trunk/maven-i18n-plugin/src/it/settings.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/settings.xml (rev 0) +++ trunk/maven-i18n-plugin/src/it/settings.xml 2010-03-30 20:35:54 UTC (rev 1731) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<settings> + + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings>

1 0

r1725 - trunk/maven-i18n-plugin
by tchemit＠users.nuiton.org 28 Mar '10

28 Mar '10

Author: tchemit Date: 2010-03-28 21:59:20 +0200 (Sun, 28 Mar 2010) New Revision: 1725 Log: add log4j in runtime for debug Modified: trunk/maven-i18n-plugin/pom.xml Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-03-28 12:16:28 UTC (rev 1724) +++ trunk/maven-i18n-plugin/pom.xml 2010-03-28 19:59:20 UTC (rev 1725) @@ -78,6 +78,12 @@ <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies>

1 0

r1724 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser
by tchemit＠users.nuiton.org 28 Mar '10

28 Mar '10

Author: tchemit Date: 2010-03-28 14:16:28 +0200 (Sun, 28 Mar 2010) New Revision: 1724 Log: Evolution #423: Improve parser log Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-03-28 11:57:13 UTC (rev 1723) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-03-28 12:16:28 UTC (rev 1724) @@ -25,7 +25,6 @@ import org.nuiton.io.SortedProperties; import org.nuiton.plugin.PluginHelper; -import java.beans.Introspector; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -322,14 +321,12 @@ for (ParserEvent event : events) { event.eventChangeFile(file); } -// I18nLogger vLog = getVerboseLog(); -// vLog.setFile(file); touchFile = false; int size = result.size(); if (!silent && verbose) { - getLog().info(print(getParser(this), 0, "parse", null, file.toString())); -// vLog.infoFile("parse", null); + getLog().info(print(0, "parse", null, + file.toString())); } parseFile(file); @@ -345,13 +342,14 @@ } if (touchFile) { if (showTouchedFiles) { - getLog().info(print(getParser(this), 0, "touch", null, file.toString())); -// vLog.infoFile("touch", null); + getLog().info(print(0, "touch", null, + file.toString())); } treadedFiles.add(file); if (getLog().isDebugEnabled()) { - getLog().debug(print(getParser(this), 0, "touch", null, file.toString() + " - " + getLogEntry(fileName, i, t000, t00))); -// vLog.debug(I18nLogger.getLogEntry(fileName, i, t000, t00)); + String time = getLogEntry(fileName, i, t000, t00); + getLog().debug(print(0, "touch", null, + file.toString() + " - " + time)); } } for (ParserEvent event : events) { @@ -393,16 +391,10 @@ events.remove(parserEvent); } - public static String getParser(AbstractI18nMojo parser) { - return "i18n:" + Introspector.decapitalize( - parser.getClass().getSimpleName()) + " on " + - parser.getArtifactId(); - } - - public static String print(String parser, int start, String prefix, String context, + public static String print(int start, String prefix, String context, String content) { StringBuilder sb = new StringBuilder(); - sb.append("[").append(prefix).append("] [").append(parser).append("] "); + sb.append("[").append(prefix).append("] "); for (int i = 0; i < start; i++) { sb.append(' ');

1 0

r1723 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 28 Mar '10

28 Mar '10

Author: tchemit Date: 2010-03-28 13:57:13 +0200 (Sun, 28 Mar 2010) New Revision: 1723 Log: Evolution #423: Improve parser log Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-28 10:57:23 UTC (rev 1722) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-28 11:57:13 UTC (rev 1723) @@ -138,10 +138,6 @@ File bundleOut = getI18nFile(bundleOutputDir, bundleOutputName, locale, false); - if (!silent) { - getLog().info("generate bundle for locale " + locale); - } - SortedProperties propertiesOut = new SortedProperties(encoding, false); StringBuilder buffer = new StringBuilder(); @@ -152,6 +148,11 @@ continue; } + if (!silent) { + getLog().info("generate bundle for locale " + locale + + " from " + urls.length + " i18n resource(s)"); + } + List<String> bundlesUrls = new ArrayList<String>(); for (URL url : urls) { long t000 = System.nanoTime(); @@ -174,7 +175,10 @@ if (!bundlesUrls.isEmpty()) { bundleDico.put(locale, buffer.substring(1)); if (!silent) { - getLog().info(bundlesUrls.size() + " i18n resource(s) detected"); + if (getLog().isDebugEnabled()) { + getLog().debug(bundlesUrls.size() + + " i18n resource(s) detected"); + } for (String u : bundlesUrls) { getLog().info(u); }

1 0

r1722 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 28 Mar '10

28 Mar '10

Author: tchemit Date: 2010-03-28 12:57:23 +0200 (Sun, 28 Mar 2010) New Revision: 1722 Log: Evolution #423: Improve parser log Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-28 10:52:25 UTC (rev 1721) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-28 10:57:23 UTC (rev 1722) @@ -176,7 +176,7 @@ if (!silent) { getLog().info(bundlesUrls.size() + " i18n resource(s) detected"); for (String u : bundlesUrls) { - getLog().info(" - " + u); + getLog().info(u); } } }

1 0

r1721 - in trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin: bundle parser
by tchemit＠users.nuiton.org 28 Mar '10

28 Mar '10

Author: tchemit Date: 2010-03-28 12:52:25 +0200 (Sun, 28 Mar 2010) New Revision: 1721 Log: Evolution #423: Improve parser log Removed: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nLogger.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-27 20:03:40 UTC (rev 1720) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-28 10:52:25 UTC (rev 1721) @@ -30,10 +30,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; /** @@ -155,6 +152,7 @@ continue; } + List<String> bundlesUrls = new ArrayList<String>(); for (URL url : urls) { long t000 = System.nanoTime(); I18nBundleEntry bundleEntry = @@ -163,7 +161,9 @@ String strPath = bundleEntry.getPath().toString(); int index = strPath.indexOf("i18n/"); - buffer.append(',').append(strPath.substring(index)); + String str = strPath.substring(index); + bundlesUrls.add(str); + buffer.append(',').append(str); if (verbose) { getLog().info( "loaded " + bundleEntry.getPath() + " in " + @@ -171,11 +171,13 @@ } } - if (buffer.length() > 0) { + if (!bundlesUrls.isEmpty()) { bundleDico.put(locale, buffer.substring(1)); if (!silent) { - getLog().info( - "bundles for locale : " + bundleDico.get(locale)); + getLog().info(bundlesUrls.size() + " i18n resource(s) detected"); + for (String u : bundlesUrls) { + getLog().info(" - " + u); + } } } propertiesOut.store(bundleOut); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-03-27 20:03:40 UTC (rev 1720) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-03-28 10:52:25 UTC (rev 1721) @@ -23,7 +23,9 @@ import org.nuiton.i18n.plugin.AbstractI18nMojo; import org.nuiton.io.FileUpdater; import org.nuiton.io.SortedProperties; +import org.nuiton.plugin.PluginHelper; +import java.beans.Introspector; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -109,6 +111,15 @@ */ protected boolean backupGetter; + + /** + * To force reparse of all sources. + * + * @parameter expression="${i18n.force}" default-value="false" + * @since 1.1.1 + */ + protected boolean force; + /** Liste des évènements */ protected List<ParserEvent> events = new ArrayList<ParserEvent>(); @@ -126,20 +137,16 @@ protected List<File> treadedFiles; - /** logger verbeux */ - protected I18nLogger verboseLog; - public boolean isStrictMode() { return strictMode; } - protected I18nLogger getVerboseLog() { - return verboseLog; + public boolean isForce() { + return force; } @Override public void init() throws Exception { - verboseLog = new I18nLogger(this); super.init(); t0 = System.nanoTime(); result = new SortedProperties(encoding); @@ -172,9 +179,6 @@ } treadedFiles = new ArrayList<File>(); -// if (!silent && verbose) { -// showTouchedFiles = true; -// } } @Override @@ -186,6 +190,10 @@ getLog().info("config - strictMode is on (all files will be" + " parsed)."); } + if (!silent && force) { + getLog().info("config - force is on (all files will be" + + " parsed)."); + } // Reprise sur un ancien parsing File oldParserFile = getGetterFile(out, getOutGetter(), true); @@ -219,7 +227,7 @@ } } else { if (!silent) { - getLog().info(getVerboseLog().getLogEntry( + getLog().info(getLogEntry( "Parsing is done. [treated file(s) : " + i + '/' + fileTreated + "]", fileTreated, 0, t0)); } @@ -234,10 +242,7 @@ } long t00 = System.nanoTime(); for (I18nSourceEntry entry : entries) { - I18nLogger vLog = getVerboseLog(); - vLog.setEntry(entry); - boolean skip = entry.init(this); if (skip) { @@ -250,34 +255,30 @@ long t000 = System.nanoTime(); int nbFiles = entry.getFiles().length; if (!silent) { -// if (!silent && verbose) { - vLog.infoEntry("start", vLog.getLogEntry( - "[incoming file(s) : " + entry.getFoudFiles() + "]", - 0, 0, 0)); + getLog().info("start entry " + entry.toString()); + getLog().info("incoming file(s) : " + entry.getFoudFiles()); } int nbTreatedFilesBefore = treadedFiles.size(); // launch parser for found files parseEntry(entry); + if (!silent && verbose) { // log skipped files for (String skipFile : entry.getSkipFiles()) { - vLog.setFile(new File(entry.getBasedir(), skipFile)); - vLog.infoFile("skip", null); + getLog().info("skip file " + skipFile); } } fileTreated += nbFiles; if (!silent) { -// if (!silent && verbose) { int nbTreatedFilesAfter = treadedFiles.size() - nbTreatedFilesBefore; - vLog.infoEntry( - "end", - vLog.getLogEntry( - "[treated file(s) : " + nbTreatedFilesAfter + - "/" + nbFiles + "]", nbFiles, t000, - t00)); + + getLog().info(getLogEntry( + "treated file(s) : " + nbTreatedFilesAfter + + "/" + nbFiles + " ", nbFiles, t000, + t00)); } t00 = System.nanoTime(); } @@ -321,13 +322,14 @@ for (ParserEvent event : events) { event.eventChangeFile(file); } - I18nLogger vLog = getVerboseLog(); - vLog.setFile(file); +// I18nLogger vLog = getVerboseLog(); +// vLog.setFile(file); touchFile = false; int size = result.size(); if (!silent && verbose) { - vLog.infoFile("parse", null); + getLog().info(print(getParser(this), 0, "parse", null, file.toString())); +// vLog.infoFile("parse", null); } parseFile(file); @@ -343,11 +345,13 @@ } if (touchFile) { if (showTouchedFiles) { - vLog.infoFile("touch", null); + getLog().info(print(getParser(this), 0, "touch", null, file.toString())); +// vLog.infoFile("touch", null); } treadedFiles.add(file); if (getLog().isDebugEnabled()) { - vLog.debug(vLog.getLogEntry(fileName, i, t000, t00)); + getLog().debug(print(getParser(this), 0, "touch", null, file.toString() + " - " + getLogEntry(fileName, i, t000, t00))); +// vLog.debug(I18nLogger.getLogEntry(fileName, i, t000, t00)); } } for (ParserEvent event : events) { @@ -389,4 +393,50 @@ events.remove(parserEvent); } + public static String getParser(AbstractI18nMojo parser) { + return "i18n:" + Introspector.decapitalize( + parser.getClass().getSimpleName()) + " on " + + parser.getArtifactId(); + } + + public static String print(String parser, int start, String prefix, String context, + String content) { + StringBuilder sb = new StringBuilder(); + sb.append("[").append(prefix).append("] [").append(parser).append("] "); + + for (int i = 0; i < start; i++) { + sb.append(' '); + } + if (context != null) { + sb.append("<").append(context).append("> "); + } + sb.append(content); + return sb.toString(); + } + + /** + * Construit une chaine de log formatée. + * + * @param msg le prefix du message + * @param nbFiles le nombre de fichiers actuellement traités + * @param time le time de traitement de ce fichier + * @param all le temps de traitement de tous les fichiers + * @return la chaine de log formatée + */ + public static String getLogEntry(String msg, int nbFiles, long time, long all) { + long now = System.nanoTime(); + long delta = now - time; + String s = msg; + if (time > 0 && all == 0) { + s += " (" + PluginHelper.convertTime(delta) + ")"; + } + if (all > 0) { + s += "(total time:" + PluginHelper.convertTime(now - all) + ")"; + } + if (nbFiles > 0) { + s += " ( ~ " + + PluginHelper.convertTime((now - all) / nbFiles) + " / file)"; + } + return s; + } } Deleted: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nLogger.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nLogger.java 2010-03-27 20:03:40 UTC (rev 1720) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nLogger.java 2010-03-28 10:52:25 UTC (rev 1721) @@ -1,127 +0,0 @@ -/** - * *##% - * I18n :: Maven Plugin - * Copyright (C) 2007 - 2010 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ -package org.nuiton.i18n.plugin.parser; - -import org.apache.maven.plugin.logging.SystemStreamLog; -import org.nuiton.i18n.plugin.AbstractI18nMojo; -import org.nuiton.plugin.PluginHelper; - -import java.beans.Introspector; -import java.io.File; - -/** - * Le logger utilisé par les mojo de parsing. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.9 - */ -public class I18nLogger extends SystemStreamLog { - - /** l'entrée en cours de traitement (pour les parseurs) */ - private SourceEntry entry; - - /** le fichier en cours de traitement (pour les parseurs) */ - protected File file; - - /** le prefix du mojo courant a ajouter dans les logs. */ - protected String parser; - - public I18nLogger(AbstractI18nMojo parser) { - this.parser = "i18n:" + Introspector.decapitalize( - parser.getClass().getSimpleName()) + " on " + - parser.getArtifactId(); - } - - @Override - public void info(CharSequence content) { - print(0, "INFO", null, content.toString()); - } - - @Override - public void debug(CharSequence content) { - print(0, "DEBUG", null, content.toString()); - } - - public void infoEntry(String action, CharSequence content) { - print(0, "INFO", action, - entry.toString() + - (content == null ? "" : " - " + content.toString())); - } - - public void infoFile(String action, String content) { - print(2, "INFO", action, file.toString() + - (content == null ? "" : " - " + content)); - } - - public void infoAction(String action, String content) { - print(2, "INFO", action, content == null ? "" : " - " + content); - } - - private void print(int start, String prefix, String context, - String content) { - StringBuilder sb = new StringBuilder(); - sb.append("[").append(prefix).append("] [").append(parser).append("] "); - - for (int i = 0; i < start; i++) { - sb.append(' '); - } - if (context != null) { - sb.append("<").append(context).append("> "); - } - sb.append(content); - System.out.println(sb.toString()); - } - - public void setEntry(SourceEntry entry) { - this.entry = entry; - } - - /** - * Construit une chaine de log formatée. - * - * @param msg le prefix du message - * @param nbFiles le nombre de fichiers actuellement traités - * @param time le time de traitement de ce fichier - * @param all le temps de traitement de tous les fichiers - * @return la chaine de log formatée - */ - public String getLogEntry(String msg, int nbFiles, long time, long all) { - long now = System.nanoTime() ; - long delta = now - time; - String s = msg; - if (time > 0 && all == 0) { - s += " (" + PluginHelper.convertTime(delta) + ")"; - } - if (all > 0) { - s += "(total time:" + PluginHelper.convertTime(now - all) + ")"; - } - if (nbFiles > 0) { - s += " ( ~ " + - PluginHelper.convertTime((now - all) / nbFiles) + " / file)"; - } - return s; - } - - public void setFile(File file) { - this.file = file; - } - -} Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java 2010-03-27 20:03:40 UTC (rev 1720) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java 2010-03-28 10:52:25 UTC (rev 1721) @@ -53,8 +53,8 @@ } setUpdater(mojo.newFileUpdater(this)); - if (mojo.isStrictMode() || updater == null) { - // mojo strict mode or not updater, so force all files + if (mojo.isStrictMode() || updater == null || mojo.isForce()) { + // mojo strict/force mode or not updater, so force all files skipFiles = EMPTY_STRING_ARRAY; files = filesForEntry; return false;

1 0

r1720 - trunk
by tchemit＠users.nuiton.org 27 Mar '10

27 Mar '10

Author: tchemit Date: 2010-03-27 21:03:40 +0100 (Sat, 27 Mar 2010) New Revision: 1720 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-15 22:16:25 UTC (rev 1719) +++ trunk/pom.xml 2010-03-27 20:03:40 UTC (rev 1720) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <artifactId>i18n</artifactId>

1 0

r1719 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 15 Mar '10

15 Mar '10

Author: tchemit Date: 2010-03-15 23:16:25 +0100 (Mon, 15 Mar 2010) New Revision: 1719 Log: Evolution #405: Add goal tapestry-bundle Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2010-03-15 22:16:12 UTC (rev 1718) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2010-03-15 22:16:25 UTC (rev 1719) @@ -21,10 +21,13 @@ package org.nuiton.i18n.plugin.bundle; import org.nuiton.i18n.plugin.AbstractI18nMojo; +import org.nuiton.plugin.PluginHelper; import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; /** @@ -50,8 +53,7 @@ /** * Nom de base des fichiers qui contient les localisations des bundles. * - * @parameter expression="${i18n.collectOutputName}" - * default-value="collect-${project.artifactId}-i18n" + * @parameter expression="${i18n.collectOutputName}" default-value="collect-${project.artifactId}-i18n" * @required * @since 1.0.2 */ @@ -88,4 +90,21 @@ return bundleOut; } + /** + * TODO Move this in PluginHelper. + * + * @param src the source file to read + * @return the url instanciated from lines of the source file. + * @throws IOException if any pb while reading file + */ + public static URL[] getLinesAsURL(File src) throws IOException { + List<URL> result = new ArrayList<URL>(); + for (String line : PluginHelper.getLines(src)) { + if (!line.isEmpty()) { + result.add(new URL(line)); + } + } + return result.toArray(new URL[result.size()]); + } + } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-15 22:16:12 UTC (rev 1718) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-03-15 22:16:25 UTC (rev 1719) @@ -30,7 +30,10 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; -import java.util.*; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; import java.util.Map.Entry; /** @@ -226,21 +229,4 @@ URL[] urls = getLinesAsURL(file); return urls; } - - /** - * TODO Move this in PluginHelper. - * - * @param src the source file to read - * @return the url instanciated from lines of the source file. - * @throws IOException if any pb while reading file - */ - public static URL[] getLinesAsURL(File src) throws IOException { - List<URL> result = new ArrayList<URL>(); - for (String line : PluginHelper.getLines(src)) { - if (!line.isEmpty()) { - result.add(new URL(line)); - } - } - return result.toArray(new URL[result.size()]); - } } Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java 2010-03-15 22:16:25 UTC (rev 1719) @@ -0,0 +1,208 @@ +package org.nuiton.i18n.plugin.bundle; + +import org.nuiton.i18n.bundle.I18nBundleEntry; +import org.nuiton.i18n.bundle.I18nBundleUtil; +import org.nuiton.io.SortedProperties; +import org.nuiton.plugin.PluginHelper; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; + + +/** + * Créer un bundle pour une application finale. + * + * Cela génère un merge de tous les fichiers i18n utilisés en un seul. + * + * On utilise la dépendance sur les artifacts pour connaitre l'ordre le + * chargement des bundles. + * + * Si dans un bundle childs, la valeur de la clef est vide, on conserve alors + * celui du parent, + * + * Ainsi on obtient un bundle dont toutes les clefs sont traduites. + * + * Le but aussi d'utiliser un unique bundle est de gagner du temps au runtime + * car la recherche des bundles devient trop couteuse en temps lorsque l'on a de + * nombreuses dépendances (au dessus de 100 deps cela peut prendre plusieurs + * secondes, ce qui 'est pas acceptable). + * + * On a ajoute un second mode d'initialisation dans la clesse I18n pour + * n'utiliser qu'un seul bundle et courcircuiter le chargement couteux... + * + * @author tchemit <chemit(a)codelutin.com> + * @goal tapestry-bundle + * @phase generate-resources + * @execute goal=collect-i18n-artifacts + * @requiresProject true + * @requiresDependencyResolution runtime + * @since 1.1.1 + */ +public class TapestryBundleMojo extends AbstractI18nBundleMojo { + + /** + * Repertoire ou generer les bundles. + * + * @parameter expression="${i18n.bundleOutputDir}" default-value="${basedir}/src/main/webapp/WEB-INF" + * @required + * @since 1.0.0 + */ + protected File bundleOutputDir; + + /** + * Nom du bundle a generer. + * + * @parameter expression="${i18n.bundleOutputName}" default-value="app" + * @required + * @since 1.0.2 + */ + protected String bundleOutputName; + + /** + * Un drapeau pour vérifier que les bundles ne contiennent pas d'entrées + * vides. + * + * @parameter expression="${i18n.checkBundle}" default-value="true" + * @required + * @since 1.0.0 + */ + protected boolean checkBundle; + + /** + * Un drapeau pour afficher les entrées vides. (nécessite {@link + * #checkBundle} activé). + * + * @parameter expression="${i18n.showEmpty}" default-value="false" + * @required + * @since 1.0.0 + */ + protected boolean showEmpty; + + @Override + public void init() throws Exception { + super.init(); + + createDirectoryIfNecessary(bundleOutputDir); + + // ajout de repertoire de generation (le parent en fait) + // dans les resources du projet + +// addResourceDir(bundleOutputDir.getParentFile(), "**/*.properties"); + } + + @Override + protected void doAction() throws Exception { + long t00 = System.nanoTime(); + + if (!silent) { + getLog().info("config - bundle name : " + bundleOutputName); + getLog().info("config - basedir : " + bundleOutputDir); + getLog().info("config - locales : " + Arrays.toString(locales)); + } + + Map<Locale, String> bundleDico = + new LinkedHashMap<Locale, String>(locales.length); + + for (Locale locale : locales) { + + long t0 = System.nanoTime(); + + File bundleOut = getTapestryI18nFile( + bundleOutputDir, + bundleOutputName, + locale, + false + ); + + if (!silent) { + getLog().info("generate bundle for locale " + locale + + " in file " + bundleOut.getName()); + } + + SortedProperties propertiesOut = + new SortedProperties(encoding, false); + StringBuilder buffer = new StringBuilder(); + + URL[] urls = getCollectI18nResources(locale); + if (urls.length == 0) { + getLog().warn("no bundle for locale " + locale); + continue; + } + + for (URL url : urls) { + long t000 = System.nanoTime(); + I18nBundleEntry bundleEntry = + new I18nBundleEntry(url, locale, null); + bundleEntry.load(propertiesOut); + String strPath = bundleEntry.getPath().toString(); + int index = strPath.indexOf("i18n/"); + + buffer.append(',').append(strPath.substring(index)); + if (verbose) { + getLog().info( + "loaded " + bundleEntry.getPath() + " in " + + PluginHelper.convertTime(t000, System.nanoTime())); + } + } + + if (buffer.length() > 0) { + bundleDico.put(locale, buffer.substring(1)); + if (!silent) { + getLog().info( + "bundles for locale : " + bundleDico.get(locale)); + } + } + propertiesOut.store(bundleOut); + if (!silent && verbose) { + getLog().info( + "bundle created in " + + PluginHelper.convertTime(t0, System.nanoTime()) + + " (detected sentences : " + propertiesOut.size() + ")"); + } + if (checkBundle) { + checkBundle(locale, propertiesOut, showEmpty); + } + } + + if (!silent && verbose) { + getLog().info("done in " + + PluginHelper.convertTime(t00, System.nanoTime())); + } + } + + /** + * @param root le repertoire ou sont stockes les fichiers i18n + * @param artifactId le nom de l'artifact + * @param locale le nom du bundle + * @param create <code>true</code> pour creer le fichier si non present + * @return le fichier i18n + * @throws IOException si probleme lors de la creation du fichier + */ + public File getTapestryI18nFile(File root, String artifactId, + Locale locale, boolean create) throws IOException { + File file = new File( + root.getAbsolutePath() + File.separatorChar + artifactId + + "_" + locale.getLanguage() + ".properties"); + if (create && !file.exists()) { + createNewFile(file); + } + return file; + } + + @Override + protected URL[] getCollectI18nResources(Locale locale) throws IOException { + File file = getCollectOutputFile(locale, false); + if (!file.exists()) { + return I18nBundleUtil.EMPTY_URL_ARRAY; + } + URL[] urls = getLinesAsURL(file); + return urls; + } + + +} Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL

1 0

r1718 - trunk/nuiton-i18n-editor
by tchemit＠users.nuiton.org 15 Mar '10

15 Mar '10

Author: tchemit Date: 2010-03-15 23:16:12 +0100 (Mon, 15 Mar 2010) New Revision: 1718 Log: update dependencies Modified: trunk/nuiton-i18n-editor/pom.xml Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2010-03-12 20:13:55 UTC (rev 1717) +++ trunk/nuiton-i18n-editor/pom.xml 2010-03-15 22:16:12 UTC (rev 1718) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -21,7 +21,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>nuiton-i18n-api</artifactId> + <artifactId>nuiton-i18n</artifactId> <version>${project.version}</version> </dependency> @@ -73,7 +73,7 @@  <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxx.version>2.0.0-beta-6</jaxx.version> + <jaxx.version>2.0</jaxx.version> <lutinutil.version>1.2</lutinutil.version>

1 0

r1717 - trunk
by tchemit＠users.nuiton.org 12 Mar '10

12 Mar '10

Author: tchemit Date: 2010-03-12 21:13:55 +0100 (Fri, 12 Mar 2010) New Revision: 1717 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-10 12:47:04 UTC (rev 1716) +++ trunk/pom.xml 2010-03-12 20:13:55 UTC (rev 1717) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>i18n</artifactId>

1 0