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

Build failed in Jenkins: i18n #2
by admin+ci-nuiton.org＠codelutin.com 03 Feb '14

03 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/i18n/2/> ------------------------------------------ Started by user Tony CHEMIT Building in workspace <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/> FATAL: com/cloudbees/jenkins/plugins/sshcredentials/SSHUserPrivateKey java.lang.NoClassDefFoundError: com/cloudbees/jenkins/plugins/sshcredentials/SSHUserPrivateKey at hudson.scm.CredentialsSVNAuthenticationProviderImpl.createAuthenticationProvider(CredentialsSVNAuthenticationProviderImpl.java:82) at hudson.scm.SubversionSCM.createAuthenticationProvider(SubversionSCM.java:1132) at hudson.scm.SubversionSCM$CheckOutTask.<init>(SubversionSCM.java:985) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:928) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:865) at hudson.model.AbstractProject.checkout(AbstractProject.java:1411) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:651) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:560) at hudson.model.Run.execute(Run.java:1670) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:519) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:231)

1 2

Build failed in Jenkins: i18n » I18n :: Maven Plugin #3
by admin+ci-nuiton.org＠codelutin.com 03 Feb '14

03 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> Changes: [Tony CHEMIT] go to 3.0-SNAPSHOT version [Tony CHEMIT] refs #2687: Rename I18n methods to be compatible with jre 8 fixes #1586: Add new AST parser for java file [Tony CHEMIT] fixes #3020: Remove deprecated parser (jsp and tapestry) ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building I18n :: Maven Plugin 3.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/code/javaparser/javaparser/1… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/code/javaparser/javaparser/1… (4 KB at 19.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo… [INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/code/javaparser/javaparser/1… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/google/code/javaparser/javaparser/1… (235 KB at 3051.7 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ i18n-maven-plugin --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ i18n-maven-plugin --- [INFO] [INFO] --- maven-plugin-plugin:3.2:helpmojo (default) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to read mojo metadata. [INFO] Applying mojo extractor for language: java-annotations [INFO] Mojo extractor for language: java-annotations found 0 mojo descriptors. [INFO] Applying mojo extractor for language: java [INFO] Mojo extractor for language: java found 0 mojo descriptors. [INFO] Applying mojo extractor for language: bsh [INFO] Mojo extractor for language: bsh found 0 mojo descriptors. [INFO] [INFO] --- maven-plugin-plugin:3.2:descriptor (default-descriptor) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to read mojo metadata. [INFO] Applying mojo extractor for language: java-annotations [INFO] Mojo extractor for language: java-annotations found 0 mojo descriptors. [INFO] Applying mojo extractor for language: java [INFO] Mojo extractor for language: java found 0 mojo descriptors. [INFO] Applying mojo extractor for language: bsh [INFO] Mojo extractor for language: bsh found 0 mojo descriptors. [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 5 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ i18n-maven-plugin --- [INFO] Compiling 28 source files to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] [INFO] --- plexus-component-metadata:1.5.5:generate-metadata (default) @ i18n-maven-plugin --- [INFO] Discovered 1 component descriptors(s) [INFO] [INFO] --- maven-plugin-plugin:3.2:descriptor (default) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to read mojo metadata. [INFO] Applying mojo extractor for language: java-annotations [INFO] Mojo extractor for language: java-annotations found 12 mojo descriptors. [INFO] Applying mojo extractor for language: java [INFO] Mojo extractor for language: java found 0 mojo descriptors. [INFO] Applying mojo extractor for language: bsh [INFO] Mojo extractor for language: bsh found 0 mojo descriptors. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ i18n-maven-plugin --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ i18n-maven-plugin --- [INFO] Compiling 4 source files to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] [INFO] --- maven-surefire-plugin:2.16:test (default-test) @ i18n-maven-plugin --- [INFO] Surefire report directory: <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running org.nuiton.i18n.plugin.parser.impl.Struts2JspFileParserTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.045 sec - in org.nuiton.i18n.plugin.parser.impl.Struts2JspFileParserTest Running org.nuiton.i18n.plugin.parser.impl.JavaFileParserTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.072 sec - in org.nuiton.i18n.plugin.parser.impl.JavaFileParserTest Running org.nuiton.i18n.plugin.parser.SourceEntryTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec - in org.nuiton.i18n.plugin.parser.SourceEntryTest Running org.nuiton.i18n.plugin.bundle.StringFormatToMessageFormatConverterTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.061 sec - in org.nuiton.i18n.plugin.bundle.StringFormatToMessageFormatConverterTest Results : Tests run: 6, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ i18n-maven-plugin --- [INFO] Building jar: <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] [INFO] --- maven-plugin-plugin:3.2:addPluginArtifactMetadata (default-addPluginArtifactMetadata) @ i18n-maven-plugin --- [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ i18n-maven-plugin --- [INFO] [INFO] --- maven-invoker-plugin:1.8:install (integration-test) @ i18n-maven-plugin --- [INFO] Installing /var/local/forge/data/nuiton.org/jenkins/workspace/i18n/trunk/pom.xml to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] Installing /var/local/forge/data/nuiton.org/jenkins/workspace/i18n/trunk/target/i18n-3.0-SNAPSHOT-site_fr.xml to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] Installing /var/local/forge/data/nuiton.org/jenkins/workspace/i18n/trunk/target/i18n-3.0-SNAPSHOT-site_en.xml to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] Installing /var/local/forge/data/nuiton.org/jenkins/workspace/i18n/trunk/nuiton-i18n/pom.xml to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] Installing /var/local/forge/data/nuiton.org/jenkins/workspace/i18n/trunk/nuiton-i18n/target/nuiton-i18n-3.0-SNAPSHOT.jar to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> to <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> [INFO] [INFO] --- maven-invoker-plugin:1.8:run (integration-test) @ i18n-maven-plugin --- [INFO] Building: evo-1507/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (7.1 s) [INFO] Building: ano-672/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (5.5 s) [INFO] Building: parsers/withNewKeys/pom.xml [INFO] ..FAILED (1.6 s) [INFO] The build exited with code 1. See <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> for details. [INFO] Building: parsers/newProject/pom.xml [INFO] ..FAILED (1.6 s) [INFO] The build exited with code 1. See <http://ci-ng.nuiton.org/jenkins/job/i18n/org.nuiton.i18n$i18n-maven-plugin/…> for details. [INFO] Building: ano-1494/migrate/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (3.1 s) [INFO] Building: ano-1494/iso-8859-1/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (3.2 s) [INFO] Building: ano-1494/utf-8/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (3.8 s) [INFO] ------------------------------------------------- [INFO] Build Summary: [INFO] Passed: 5, Failed: 2, Errors: 0, Skipped: 0 [INFO] ------------------------------------------------- [ERROR] The following builds failed: [ERROR] * parsers/withNewKeys/pom.xml [ERROR] * parsers/newProject/pom.xml [INFO] ------------------------------------------------- [JENKINS] Archiving disabled

1 1

r2018 - in trunk/i18n-maven-plugin/src/it: . parsers/newProject parsers/newProject/src/main parsers/withNewKeys parsers/withNewKeys/src/main
by tchemit＠users.nuiton.org 03 Feb '14

03 Feb '14

Author: tchemit Date: 2014-02-03 13:06:44 +0100 (Mon, 03 Feb 2014) New Revision: 2018 Url: http://nuiton.org/projects/i18n/repository/revisions/2018 Log: fixes #3020: Remove deprecated parser (jsp and tapestry) Removed: trunk/i18n-maven-plugin/src/it/parsers/newProject/src/main/webapp/ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/webapp/ Modified: trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/i18n-maven-plugin/src/it/settings.xml Modified: trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml 2014-02-03 12:06:44 UTC (rev 2018) @@ -77,26 +77,10 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> - <goal>parserTapestry</goal> <goal>parserGWTJava</goal> </goals> </execution> <execution> - <id>jsp</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <jsp>http://java.sun.com/JSP/Page</jsp> - </namespaces> - </configuration> - </execution> - <execution> <id>gen</id> <goals> <goal>gen</goal> Modified: trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy 2014-02-03 12:06:44 UTC (rev 2018) @@ -48,12 +48,6 @@ assert checkKeysInFile('target/generated-sources/i18n/validation.getter', ['validationGetter.key1=', 'validationGetter.key2=']) -assert checkKeysInFile('target/generated-sources/i18n/jsp.getter', - ['jspGetter.key1=', 'jspGetter.key2=']) - -assert checkKeysInFile('target/generated-sources/i18n/tapestry.getter', - ['tmlGetter.key1=', 'tmlGetter.key2=']) - assert checkKeysInFile('target/generated-sources/i18n/gwt-java.getter', ['gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=']) @@ -61,8 +55,6 @@ [ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'validationGetter.key1=', 'validationGetter.key2=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) @@ -70,8 +62,6 @@ [ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'validationGetter.key1=', 'validationGetter.key2=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) Modified: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml 2014-02-03 12:06:44 UTC (rev 2018) @@ -89,25 +89,9 @@ <goal>parserJava</goal> <goal>parserGWTJava</goal> <goal>parserValidation</goal> - <goal>parserTapestry</goal> </goals> </execution> <execution> - <id>jsp</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <jsp>http://java.sun.com/JSP/Page</jsp> - </namespaces> - </configuration> - </execution> - <execution> <id>first-gen</id> <goals> <goal>gen</goal> @@ -120,7 +104,6 @@ <goal>parserJava</goal> <goal>parserGWTJava</goal> <goal>parserValidation</goal> - <goal>parserTapestry</goal> <goal>gen</goal> </goals> <phase>compile</phase> Deleted: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp 2014-02-03 12:06:44 UTC (rev 2018) @@ -1,36 +0,0 @@ - -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><s:text name="jspGetter.key1"/></title> -</head> -<s:text name="jspGetter.key2"/> -<body> -</body> -</html> \ No newline at end of file Modified: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy 2014-02-03 12:06:44 UTC (rev 2018) @@ -50,12 +50,6 @@ assert checkKeysInFile('target/generated-sources/i18n/validation.getter', ['validationGetter.key1=', 'validationGetter.key2=', 'validationGetter.key3=']) -assert checkKeysInFile('target/generated-sources/i18n/jsp.getter', - ['jspGetter.key1=', 'jspGetter.key2=']) - -assert checkKeysInFile('target/generated-sources/i18n/tapestry.getter', - ['tmlGetter.key1=', 'tmlGetter.key2=']) - assert checkKeysInFile('target/generated-sources/i18n/gwt-java.getter', ['gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=']) @@ -64,8 +58,6 @@ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'javaGetter.old.key1=', 'javaGetter.old.key2=', 'validationGetter.key1=', 'validationGetter.key2=', 'validationGetter.key3=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) @@ -73,72 +65,7 @@ [ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'validationGetter.key1=', 'validationGetter.key2=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) -// -//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=' ); -//assert content.contains( 'javaGetter.key3=' ); -//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=' ); -//assert content.contains( 'validationGetter.key3=' ); - -//file = new File(basedir, 'target/generated-sources/i18n/jsp.getter'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains( 'jspGetter.key1=' ); -//assert content.contains( 'jspGetter.key2=' ); -// -// -//file = new File(basedir, 'target/generated-sources/i18n/tapestry.getter'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains( 'tmlGetter.key1=' ); -//assert content.contains( 'tmlGetter.key2=' ); - -//file = new File(basedir, 'target/generated-sources/i18n/gwt-java.getter'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains( 'gwtJavaGetter.key1=' ); -//assert content.contains( 'gwtJavaGetter.key2=' ); -//assert content.contains( 'gwtJavaGetter.key3=' ); - -//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('javaGetter.key3='); -//assert content.contains('validationGetter.key1='); -//assert content.contains('validationGetter.key2='); -//assert content.contains('validationGetter.key3='); -//assert content.contains('jspGetter.key1='); -//assert content.contains('jspGetter.key2='); -// -//assert content.contains('tmlGetter.key1='); -//assert content.contains('tmlGetter.key2='); -// -//assert content.contains('gwtJavaGetter.key1='); -//assert content.contains('gwtJavaGetter.key2='); -//assert content.contains('gwtJavaGetter.key3='); - return true; Modified: trunk/i18n-maven-plugin/src/it/settings.xml =================================================================== --- trunk/i18n-maven-plugin/src/it/settings.xml 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/settings.xml 2014-02-03 12:06:44 UTC (rev 2018) @@ -35,7 +35,7 @@ <repositories> <repository> <id>local.central</id> - <url>file:///@localRepository@</url> + <url>file:///@localRepositoryUrl@</url> <releases> <enabled>true</enabled> </releases> @@ -47,7 +47,7 @@ <pluginRepositories> <pluginRepository> <id>local.central</id> - <url>file:///@localRepository@</url> + <url>file:///@localRepositoryUrl@</url> <releases> <enabled>true</enabled> </releases>

1 0

r2017 - in trunk: . i18n-maven-plugin nuiton-i18n nuiton-i18n-editor
by tchemit＠users.nuiton.org 03 Feb '14

03 Feb '14

Author: tchemit Date: 2014-02-03 12:40:34 +0100 (Mon, 03 Feb 2014) New Revision: 2017 Url: http://nuiton.org/projects/i18n/repository/revisions/2017 Log: go to 3.0-SNAPSHOT version Modified: trunk/i18n-maven-plugin/pom.xml trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) +++ trunk/i18n-maven-plugin/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.6-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) +++ trunk/nuiton-i18n/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.6-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) +++ trunk/nuiton-i18n-editor/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.6-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) +++ trunk/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) @@ -35,7 +35,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.6-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description>

1 0

r2016 - in trunk: . i18n-maven-plugin i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n i18n-maven-plugin/src/it/parsers/newProject/s
by tchemit＠users.nuiton.org 03 Feb '14

03 Feb '14

Author: tchemit Date: 2014-02-03 12:39:42 +0100 (Mon, 03 Feb 2014) New Revision: 2016 Url: http://nuiton.org/projects/i18n/repository/revisions/2016 Log: refs #2687: Rename I18n methods to be compatible with jre 8 fixes #1586: Add new AST parser for java file Modified: trunk/i18n-maven-plugin/pom.xml trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java trunk/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java trunk/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java trunk/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java trunk/i18n-maven-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx trunk/nuiton-i18n/pom.xml trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java trunk/pom.xml trunk/src/site/apt/helloWorld.apt trunk/src/site/apt/library.apt.vm trunk/src/site/en/apt/helloWorld.apt trunk/src/site/en/apt/library.apt.vm Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -54,6 +54,12 @@ </dependency> <dependency> + <groupId>com.google.code.javaparser</groupId> + <artifactId>javaparser</artifactId> + <version>1.0.8</version> + </dependency> + + <dependency> <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> </dependency> Modified: trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java =================================================================== --- trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -32,8 +32,8 @@ */ public interface MessageConstants { - String MESSAGE_1 = I18n._("message1"); + String MESSAGE_1 = I18n.t("message1"); - String MESSAGE_2 = I18n._("message2"); + String MESSAGE_2 = I18n.t("message2"); } Modified: trunk/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java =================================================================== --- trunk/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -32,8 +32,8 @@ */ public interface MessageConstants { - String MESSAGE_1 = I18n._("message1"); + String MESSAGE_1 = I18n.t("message1"); - String MESSAGE_2 = I18n._("message2"); + String MESSAGE_2 = I18n.t("message2"); } Modified: trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java =================================================================== --- trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -32,6 +32,6 @@ */ public interface MessageConstants { - String HELLO = I18n.n_("hello"); + String HELLO = I18n.n("hello"); } Modified: trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java =================================================================== --- trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -47,7 +47,7 @@ new DefaultI18nInitializer("ResultBundle", null, "org/nuiton/"); I18n.init(initializer, new Locale("ja", "JP")); - String message = I18n._(MessageConstants.HELLO); + String message = I18n.t(MessageConstants.HELLO); Assert.assertEquals("こんにちは世界", message); } @@ -60,7 +60,7 @@ new DefaultI18nInitializer("ResultBundle", null, "org/nuiton/"); I18n.init(initializer, new Locale("fr", "FR")); - String message = I18n._(MessageConstants.HELLO); + String message = I18n.t(MessageConstants.HELLO); Assert.assertEquals("Salut à tous", message); } Modified: trunk/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -59,13 +59,13 @@ I18n.setDefaultLocale(Locale.FRANCE); expected = FRENCH_HELLO; - actual = I18n._(I18n_KEY); + actual = I18n.t(I18n_KEY); Assert.assertEquals(expected, actual); I18n.setDefaultLocale(Locale.ENGLISH); expected = ENGLISH_HELLO; - actual = I18n._(I18n_KEY); + actual = I18n.t(I18n_KEY); Assert.assertEquals(expected, actual); } @@ -75,11 +75,11 @@ String expected, actual; expected = FRENCH_HELLO; - actual = I18n.l_(Locale.FRANCE, I18n_KEY); + actual = I18n.l(Locale.FRANCE, I18n_KEY); Assert.assertEquals(expected, actual); expected = ENGLISH_HELLO; - actual = I18n.l_(Locale.UK, I18n_KEY); + actual = I18n.l(Locale.UK, I18n_KEY); Assert.assertEquals(expected, actual); } Modified: trunk/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java =================================================================== --- trunk/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -57,7 +57,7 @@ I18n.init(initializer, Locale.FRANCE); String expected = "Message qui fait attention à la conversion de param"; - String actual = I18n._("lib.property.message2", "param"); + String actual = I18n.t("lib.property.message2", "param"); Assert.assertEquals(expected, actual); } Modified: trunk/i18n-maven-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -26,17 +26,17 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.l; public class MyBean { - protected String field1 = n_("javaGetter.key1"); + protected String field1 = n("javaGetter.key1"); - protected String field2 = _("javaGetter.key2"); + protected String field2 = t("javaGetter.key2"); public void method() { - l_(Locale.FRENCH,"javaGetter.key3"); + l(Locale.FRENCH, "javaGetter.key3"); } } Modified: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -26,18 +26,18 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.l; public class MyBean { - protected String field1 = n_("javaGetter.key1"); + protected String field1 = n("javaGetter.key1"); - protected String field2 = _("javaGetter.key2"); + protected String field2 = t("javaGetter.key2"); public void method() { - l_(Locale.FRENCH,"javaGetter.key3"); + l(Locale.FRENCH, "javaGetter.key3"); } } Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -25,6 +25,14 @@ package org.nuiton.i18n.plugin.parser.impl; +import japa.parser.JavaParser; +import japa.parser.ParseException; +import japa.parser.ast.CompilationUnit; +import japa.parser.ast.expr.Expression; +import japa.parser.ast.expr.MethodCallExpr; +import japa.parser.ast.visitor.VoidVisitorAdapter; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -42,10 +50,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.util.List; -import java.util.regex.Matcher; import java.util.regex.Pattern; /** @@ -121,14 +125,6 @@ protected static class JavaFileParser extends AbstractFileParser { - /** - * Pattern used to detect i18n keys. - * - * @since 2.3 - */ - protected final Pattern i18nPattern = - Pattern.compile("(?:^_\\(\\s*\\\"|[^l]_\\(\\s*\\\"|l_\\([^,]+\\s*,\\s*\\\")(.*?)\""); - public JavaFileParser(Log log, String encoding, SortedProperties oldParser, @@ -137,49 +133,79 @@ super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); } - public Pattern getI18nPattern() { - return i18nPattern; - } - @Override public void parseFile(File file) throws IOException { - String line = null; - LineNumberReader lnr = new LineNumberReader(new InputStreamReader( - new FileInputStream(file), getEncoding())); + + CompilationUnit cu; + FileInputStream inputStream = FileUtils.openInputStream(file); try { - while ((line = lnr.readLine()) != null) { - parseLine(file, line); - } - } catch (Exception e) { - if (line != null) { - getLog().error( - "could not parse line (" + lnr.getLineNumber() + ") '" - + line + "' of file " + file); - } + // parse the file + cu = JavaParser.parse(inputStream); + inputStream.close(); + } catch (ParseException e) { throw new ParserException(e); } finally { - lnr.close(); + IOUtils.closeQuietly(inputStream); } + + // visit and print the methods names + new MethodVisitor(file).visit(cu, null); } @Override public void parseLine(File file, String line) throws IOException { + } - Matcher matcher = i18nPattern.matcher(line); + /** + * Simple visitor implementation for visiting MethodDeclaration nodes. + */ + class MethodVisitor extends VoidVisitorAdapter<String> { - while (matcher.find()) { + protected final File file; - String key = matcher.group(1); - if (getLog().isDebugEnabled()) { - getLog().debug(file.getName() + " detected key = " + key); + MethodVisitor(File file) { + this.file = file; + } + + @Override + public void visit(MethodCallExpr n, String arg) { + + if (n.getName().matches("[nt]?")) { + if (n.getArgs().size() == 1) { + String firstArgs = n.getArgs().get(0).toString(); + if (firstArgs.matches("^\"[^\"]+\"$")) { + String key = firstArgs.substring(1).substring(0, firstArgs.length() - 2); + if (getLog().isDebugEnabled()) { + getLog().debug(file.getName() + " detected key = " + key); + } + ParserJavaMojo.JavaFileParser.this.registerKey(key); + } + + } } -// // one key found in file, so file is marked as touched -// setTouched(true); + if (n.getName().matches("[l]?")) { + if (n.getArgs().size() == 2) { + Expression arg1 = n.getArgs().get(0); + Expression arg2 = n.getArgs().get(1); + //FIXME tchemit-2014-02-03 We should test that the first args is Locale typed + boolean accept = arg1.toString().contains("Locale"); + String keyParams = arg2.toString(); + boolean match = accept && keyParams.matches("^\"[^\"]+\"$"); - // register key - registerKey(key); + if (match) { + String key = keyParams.substring(1).substring(0, keyParams.length() - 2); + if (getLog().isDebugEnabled()) { + getLog().debug(file.getName() + " detected key = " + key); + } + ParserJavaMojo.JavaFileParser.this.registerKey(key); + } + + } + } } } + } + } Modified: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -24,6 +24,7 @@ */ package org.nuiton.i18n.plugin.parser.impl; +import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.logging.SystemStreamLog; import org.junit.After; import org.junit.Assert; @@ -84,61 +85,145 @@ @Test public void getKeys() throws IOException { - File file = new File("getKeys"); - String line; + String classContent = "" + + "package org.nuiton.i18n;" + + "import org.nuiton.i18n.I18n;" + + "import static org.nuiton.i18n.I18n.t;" + + "class TestFuctionN {" + + "String key = I18n.t(\"a\");" + + "String key2 = org.nuiton.i18n.t(\"b\");" + + "String key3 = t(\"c\");" + + "String key4 = t(" + + "\"d\");" + + "String key5 = tt(\"e\");" + + "String t(String n) { return null; }" + + "}"; - line = "_(\"myKey\");"; - parseLine(file, line, "myKey"); + File file = new File(FileUtils.getTempDirectory(), "getKeys"); + FileUtils.write(file, classContent); - line = "_(\"MyKey\" "; - parseLine(file, line, "MyKey"); +// String line; - line = " blabla _(\"myKey2\");"; - parseLine(file, line, "myKey2"); +// line = "n(\"a\");"; + parseLine(file, new String[]{"e"}, "a", "b", "c", "d"); - line = " blabla \n somewhere else..." + - "_(\"myKey3\");"; - parseLine(file, line, "myKey3"); +// File file = new File("getKeys"); +// String line; +// +// line = "t(\"myKey\");"; +// parseLine(file, line, "myKey"); +// +// line = "t(\"MyKey\" "; +// parseLine(file, line, "MyKey"); +// +// line = " blabla t(\"myKey2\");"; +// parseLine(file, line, "myKey2"); +// +// line = " blabla \n somewhere else..." + +// "t(\"myKey3\");"; +// parseLine(file, line, "myKey3"); } @Test public void getKeys2() throws IOException { - String line; - File file = new File("getKeys2"); + String classContent = "" + + "package org.nuiton.i18n;" + + "import org.nuiton.i18n.I18n;" + + "import static org.nuiton.i18n.I18n.n;" + + "class TestFuctionN {" + + "String key = I18n.n(\"a\");" + + "String key2 = org.nuiton.i18n.n(\"b\");" + + "String key3 = n(\"c\");" + + "String key4 = n(" + + "\"d\");" + + "String key5 = nn(\"e\");" + + "String nn(String n) { return null; }" + + "}"; - line = "n_(\"myKey\");"; - parseLine(file, line, "myKey"); + File file = new File(FileUtils.getTempDirectory(), "getKeys2"); + FileUtils.write(file, classContent); - line = "n_(\"MyKey\" "; - parseLine(file, line, "MyKey"); +// String line; - line = " blabla n_(\"myKey2\");"; - parseLine(file, line, "myKey2"); +// line = "n(\"a\");"; + parseLine(file, new String[]{"e"}, "a", "b", "c", "d"); - line = " blabla \n somewhere else..." + - "n_(\"myKey3\");"; - parseLine(file, line, "myKey3"); +// line = ".n(\"b\");"; +// parseLine(file, line, "b"); +// +// line = " n(\"c\");"; +// parseLine(file, line, "c"); +// +// line = "aan(\"d\");"; +// parseBadLine(file, line, "d"); +// +// line = "aa n(\"e\");"; +// parseLine(file, line, "e"); +// +// line = "n(\"f\" "; +// parseLine(file, line, "f"); +// +// line = " blabla n(\"g\");"; +// parseLine(file, line, "g"); +// +// line = " blabla \n somewhere else..." + +// "n(\"h\");"; +// parseLine(file, line, "h"); } @Test public void getKeys3() throws IOException { - String line; - File file = new File("getKeys3"); + String classContent = "" + + "package org.nuiton.i18n;" + + "import org.nuiton.i18n.I18n;" + + "import java.util.Locale;" + + "import static org.nuiton.i18n.I18n.l;" + + "import static java.util.Locale.UK;" + + "class TestFuctionN {" + + "String key = I18n.l(Locale.UK, \"a\");" + + "/*FIXME Can't detect this String key = I18n.l(UK, \"aa\");*/" + + "String key2 = org.nuiton.i18n.l(Locale.UK, \"b\");" + + "String key3 = l(Locale.UK, \"c\");" + + "String key4 = l(Locale.UK, " + + "\"d\");" + + "String key5 = ll(java.util.Locale.UK, \"e\");" + + "String t(String n) { return null; }" + + "}"; - line = "l_(Locale.UK, \"myKey\");"; - parseLine(file, line, "myKey"); + File file = new File(FileUtils.getTempDirectory(), "getKeys3"); + FileUtils.write(file, classContent); - line = "l_( Locale.UK , \"MyKey\""; - parseLine(file, line, "MyKey"); +// String line; - line = " blabla l_(Locale.UK, \"myKey2\");"; - parseLine(file, line, "myKey2"); +// line = "n(\"a\");"; + parseLine(file, new String[]{"e", "aa"}, "a", "b", "c", "d"); - line = " blabla \n somewhere else..." + - "l_(Locale.UK, \"myKey3\");"; - parseLine(file, line, "myKey3"); +// String line; +// File file = new File("getKeys3"); +// +// line = "l(Locale.UK, \"myKey\");"; +// parseLine(file, line, "myKey"); +// +// line = ".l(Locale.UK, \"myKey\");"; +// parseLine(file, line, "myKey"); +// +// line = " l(Locale.UK, \"myKey\");"; +// parseLine(file, line, "myKey"); +// +// line = "al(Locale.UK, \"myKey\");"; +// parseBadLine(file, line, "myKey"); +// +// line = "l( Locale.UK , \"MyKey\""; +// parseLine(file, line, "MyKey"); +// +// line = " blabla l(Locale.UK, \"myKey2\");"; +// parseLine(file, line, "myKey2"); +// +// line = " blabla \n somewhere else..." + +// "l(Locale.UK, \"myKey3\");"; +// parseLine(file, line, "myKey3"); } protected void parseLine(File f, String line, String... expectedKeys) throws IOException { @@ -150,4 +235,32 @@ detectedKeys.contains(expectedKey)); } } + + protected void parseLine(File f, String[] notExpectedKeys, String... expectedKeys) throws IOException { + parser.parseFile(f); + + for (String expectedKey : expectedKeys) { + + Assert.assertTrue("Key " + expectedKey + + " was expected from file " + f, + detectedKeys.contains(expectedKey)); + } + + for (String expectedKey : notExpectedKeys) { + + Assert.assertFalse("Key " + expectedKey + + " was NOT expected from file " + f, + detectedKeys.contains(expectedKey)); + } + } + + protected void parseBadLine(File f, String line, String... expectedKeys) throws IOException { + parser.parseLine(f, line); + for (String expectedKey : expectedKeys) { + + Assert.assertFalse("Key " + expectedKey + + " was not expected from line " + line, + detectedKeys.contains(expectedKey)); + } + } } Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -46,7 +46,7 @@ * the translation support with the init(String language) or init(String * language, String country), init(Localelocale) static methods in your main, ( * eg: I18n.init("fr","FR") ) <li> call the translate static method for each - * sentence, ( eg: I18n.l_("hello you !") ) <li> create a resource file for each + * sentence, ( eg: I18n.l("hello you !") ) <li> create a resource file for each * language following the naming convention given in the * java.util.ResourceBundle javadoc and translate all the sentence. </ul> * @@ -153,7 +153,7 @@ /** * Sets the default locale used by I18n for the method - * {@link I18n#_(String, Object...)}. * + * {@link I18n#t(String, Object...)}. * * <p/> * As a side effect, it will also set this locale is the default locale in * the system (says the method {@link Locale#getDefault()} will return the @@ -175,7 +175,7 @@ /** * Obtain the default locale setted in I18n. This very locale is used in * translation when no locale information is given - * (says in method {@link I18n#_(String, Object...)}. + * (says in method {@link I18n#t(String, Object...)}. * <p/> * <b>Note :</b> The I18n system must have been initialized by one of the * {@code init} method. @@ -255,7 +255,7 @@ * sinon. * @since 2.1 */ - public static String l_(Locale locale, String message, Object... args) { + public static String l(Locale locale, String message, Object... args) { checkInit(); @@ -286,7 +286,7 @@ } catch (Exception zzz) { if (log.isWarnEnabled()) { log.warn( - _("nuitonutil.error.i18n.untranslated.message", message), + t("nuitonutil.error.i18n.untranslated.message", message), zzz); } return applyFilter(message); @@ -302,7 +302,7 @@ * @return la traduction si possible ou la chaine passee en parametre * sinon. */ - public static String _(String message, Object... args) { + public static String t(String message, Object... args) { // if the key to translate is null, just return null if (message == null) { @@ -313,7 +313,7 @@ Locale locale = getDefaultLocale(); // translate with this locale - String result = l_(locale, message, args); + String result = l(locale, message, args); return result; } @@ -325,7 +325,7 @@ * <p/> * Par exemple : * <pre>String key = "nuitonutils.key"; - * String result = l_(key)</pre> + * String result = l(key)</pre> * fonctionnera, mais la chaine n'aura pas été marquée comme devant être * internationalisé. * <p/> @@ -337,7 +337,7 @@ * @param args les parametres pour le message. * @return le message passe en argument mais formatté avec les parametres */ - public static String n_(String message, Object... args) { + public static String n(String message, Object... args) { if (args.length == 0) { return message; } @@ -350,7 +350,7 @@ } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn( - _("nuitonutil.error.i18n.unformated.message", message, Arrays.toString(args)), + t("nuitonutil.error.i18n.unformated.message", message, Arrays.toString(args)), eee); } return message; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -49,7 +49,7 @@ @Override public Object handleGetObject(String key) { - return I18n._(key); + return I18n.t(key); } } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -80,7 +80,7 @@ * Obtain the current language setted in the store. * <p/> * This language is used for all translations without locale information - * (says the method {@link I18n#_(String, Object...)}). + * (says the method {@link I18n#t(String, Object...)}). * * @return the current language or {@code null} if none is defined * @since 2.1 @@ -93,7 +93,7 @@ * Obtain the current locale setted in the store. * <p/> * This locale is coming from the current language and is used for all - * translations without locale information (says the method {@link I18n#_(String, Object...)}. + * translations without locale information (says the method {@link I18n#t(String, Object...)}. * * @return the current locale or {@code null} if no current language is setted * @since 2.1 Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2014-02-03 11:39:42 UTC (rev 2016) @@ -67,7 +67,7 @@ // pas de traduction possible car l'initialiser n'est pas bon :) expected = "key.with.param"; - actual = I18n._("key.with.param"); + actual = I18n.t("key.with.param"); Assert.assertEquals(expected, actual); } @@ -82,10 +82,10 @@ // pas de traduction possible car l'initialiser n'est pas bon :) expected = "key.with.param"; - actual = I18n.l_(Locale.FRANCE, "key.with.param"); + actual = I18n.l(Locale.FRANCE, "key.with.param"); Assert.assertEquals(expected, actual); - actual = I18n.l_(Locale.UK, "key.with.param"); + actual = I18n.l(Locale.UK, "key.with.param"); Assert.assertEquals(expected, actual); } @@ -112,7 +112,7 @@ I18n.init(initializer, Locale.JAPAN); Assert.assertNotNull(I18n.store.resolver.getEncoding()); - Assert.assertEquals("最初の", I18n._("key.one")); + Assert.assertEquals("最初の", I18n.t("key.one")); } @Test @@ -127,11 +127,11 @@ // I18n.getStore().setLanguage(Locale.FRANCE); expected = "Clé avec %s"; - actual = I18n._("key.with.param"); + actual = I18n.t("key.with.param"); Assert.assertEquals(expected, actual); expected = "Clé avec param"; - actual = I18n._("key.with.param", "param"); + actual = I18n.t("key.with.param", "param"); Assert.assertEquals(expected, actual); // passage en anglais @@ -140,11 +140,11 @@ // I18n.getStore().setLanguage(Locale.UK); expected = "Key with %s"; - actual = I18n._("key.with.param"); + actual = I18n.t("key.with.param"); Assert.assertEquals(expected, actual); expected = "Key with param"; - actual = I18n._("key.with.param", "param"); + actual = I18n.t("key.with.param", "param"); Assert.assertEquals(expected, actual); // passage langue inconnue @@ -153,11 +153,11 @@ // I18n.getStore().setLanguage(Locale.CHINA); expected = "key.with.param"; - actual = I18n._("key.with.param"); + actual = I18n.t("key.with.param"); Assert.assertEquals(expected, actual); expected = "key.with.param"; - actual = I18n._("key.with.param", "param"); + actual = I18n.t("key.with.param", "param"); Assert.assertEquals(expected, actual); } @@ -172,11 +172,11 @@ I18n.init(initializer, null); expected = "Clé avec %s"; - actual = I18n.l_(Locale.FRANCE, "key.with.param"); + actual = I18n.l(Locale.FRANCE, "key.with.param"); Assert.assertEquals(expected, actual); expected = "Clé avec param"; - actual = I18n.l_(Locale.FRANCE, "key.with.param", "param"); + actual = I18n.l(Locale.FRANCE, "key.with.param", "param"); Assert.assertEquals(expected, actual); // en anglais @@ -184,21 +184,21 @@ // I18n.getStore().setLanguage(Locale.UK); expected = "Key with %s"; - actual = I18n.l_(Locale.UK, "key.with.param"); + actual = I18n.l(Locale.UK, "key.with.param"); Assert.assertEquals(expected, actual); expected = "Key with param"; - actual = I18n.l_(Locale.UK, "key.with.param", "param"); + actual = I18n.l(Locale.UK, "key.with.param", "param"); Assert.assertEquals(expected, actual); // dans une langue inconnue expected = "key.with.param"; - actual = I18n.l_(Locale.CHINA, "key.with.param"); + actual = I18n.l(Locale.CHINA, "key.with.param"); Assert.assertEquals(expected, actual); expected = "key.with.param"; - actual = I18n.l_(Locale.CHINA, "key.with.param", "param"); + actual = I18n.l(Locale.CHINA, "key.with.param", "param"); Assert.assertEquals(expected, actual); } @@ -211,15 +211,15 @@ Date date = new GregorianCalendar(2011, 4, 5).getTime(); String expected = "Key with 05-May-2011"; - String actual = I18n.l_(Locale.UK, "key.with.date", date); + String actual = I18n.l(Locale.UK, "key.with.date", date); Assert.assertEquals(expected, actual); expected = "とキー 2011/05/05"; - actual = I18n.l_(Locale.JAPAN, "key.with.date", date); + actual = I18n.l(Locale.JAPAN, "key.with.date", date); Assert.assertEquals(expected, actual); expected = "Clé avec 5 mai 2011"; - actual = I18n.l_(Locale.FRANCE, "key.with.date", date); + actual = I18n.l(Locale.FRANCE, "key.with.date", date); Assert.assertEquals(expected, actual); } @@ -232,7 +232,7 @@ I18n.init(initializer, Locale.FRANCE); String key = "youhou"; - String text = I18n._(key); + String text = I18n.t(key); Assert.assertNotNull(text); Assert.assertEquals(key, text); @@ -241,10 +241,10 @@ initializer.setMissingKeyReturnNull(true); I18n.init(initializer, Locale.FRANCE); - text = I18n._(key); + text = I18n.t(key); Assert.assertNull(text); - text = I18n._(key, 123); + text = I18n.t(key, 123); Assert.assertNull(text); } Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.5.1-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -28,7 +28,7 @@ java.util.Locale jaxx.runtime.JAXXContext -static org.nuiton.i18n.I18n._ +static t </import>  Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -29,7 +29,7 @@ org.nuiton.i18n.editor.I18nEditorContext -static org.nuiton.i18n.I18n._ +static t </import>  Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -35,7 +35,7 @@ org.nuiton.i18n.editor.project.I18nProject org.nuiton.i18n.editor.project.AbstractI18nProject -static org.nuiton.i18n.I18n._ +static t </import>  Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -29,7 +29,7 @@ org.nuiton.i18n.editor.I18nEditorContext -static org.nuiton.i18n.I18n._ +static t </import> <String id='bundle'/> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -29,7 +29,7 @@ org.nuiton.i18n.editor.I18nEditorContext -static org.nuiton.i18n.I18n._ +static t </import> <String id='bundle'/> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -46,7 +46,7 @@ javax.swing.tree.TreeNode java.awt.Component -static org.nuiton.i18n.I18n._ +static t </import> <script><![CDATA[ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -31,7 +31,7 @@ java.util.Locale jaxx.runtime.JAXXContext -static org.nuiton.i18n.I18n._ +static t </import>  Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -55,8 +55,8 @@ java.awt.event.MouseAdapter java.awt.event.MouseEvent -static org.nuiton.i18n.I18n.n_ -static org.nuiton.i18n.I18n._ +static n +static t </import> <script><![CDATA[ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -35,8 +35,8 @@ javax.swing.JLabel java.awt.Color -static org.nuiton.i18n.I18n.n_ -static org.nuiton.i18n.I18n._ +static n +static t </import> <script><![CDATA[ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -39,7 +39,7 @@ java.awt.GridBagConstraints java.awt.Insets -static org.nuiton.i18n.I18n._ +static t </import> <script><![CDATA[ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -32,7 +32,7 @@ org.nuiton.i18n.editor.project.I18nProjectFactory org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI -static org.nuiton.i18n.I18n._ +static t </import> <script><![CDATA[ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -37,7 +37,7 @@ java.io.File -static org.nuiton.i18n.I18n._ +static t </import> <script><![CDATA[ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -31,7 +31,7 @@ javax.swing.JLabel -static org.nuiton.i18n.I18n._ +static t </import> <script><![CDATA[ Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx 2014-02-03 11:39:42 UTC (rev 2016) @@ -31,7 +31,7 @@ org.nuiton.i18n.editor.ui.project.ProjectStep org.nuiton.i18n.editor.ui.project.SelectBundlesTableModel -static org.nuiton.i18n.I18n._ +static t </import> <script><![CDATA[ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/pom.xml 2014-02-03 11:39:42 UTC (rev 2016) @@ -31,11 +31,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.6</version> </parent> <artifactId>i18n</artifactId> - <version>2.5.3-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> @@ -102,6 +102,12 @@ <version>2.1</version> </dependency> + <dependency> + <groupId>com.google.code.javaparser</groupId> + <artifactId>javaparser</artifactId> + <version>1.0.8</version> + </dependency> +  <dependency> <groupId>org.apache.maven</groupId> Modified: trunk/src/site/apt/helloWorld.apt =================================================================== --- trunk/src/site/apt/helloWorld.apt 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/src/site/apt/helloWorld.apt 2014-02-03 11:39:42 UTC (rev 2016) @@ -37,8 +37,8 @@ La classe java correspondante ressemble à ça : ---------------------------------------------------------------------------- -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; class HelloWorld { Modified: trunk/src/site/apt/library.apt.vm =================================================================== --- trunk/src/site/apt/library.apt.vm 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/src/site/apt/library.apt.vm 2014-02-03 11:39:42 UTC (rev 2016) @@ -181,7 +181,7 @@ ------------------------------------------------------------------------------- package org.myOrganisation.myLibrary; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; public class myLibrary { Modified: trunk/src/site/en/apt/helloWorld.apt =================================================================== --- trunk/src/site/en/apt/helloWorld.apt 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/src/site/en/apt/helloWorld.apt 2014-02-03 11:39:42 UTC (rev 2016) @@ -36,8 +36,8 @@ The corresponding java class looks like this : ---------------------------------------------------------------------------- -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; class HelloWorld { Modified: trunk/src/site/en/apt/library.apt.vm =================================================================== --- trunk/src/site/en/apt/library.apt.vm 2014-02-03 11:38:28 UTC (rev 2015) +++ trunk/src/site/en/apt/library.apt.vm 2014-02-03 11:39:42 UTC (rev 2016) @@ -180,7 +180,7 @@ ------------------------------------------------------------------------------- package org.myOrganisation.myLibrary; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; public class myLibrary {

1 0

r2015 - trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 03 Feb '14

03 Feb '14

Author: tchemit Date: 2014-02-03 12:38:28 +0100 (Mon, 03 Feb 2014) New Revision: 2015 Url: http://nuiton.org/projects/i18n/repository/revisions/2015 Log: fixes #3020: Remove deprecated parser (jsp and tapestry) Removed: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java Deleted: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2013-08-09 09:04:00 UTC (rev 2014) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2014-02-03 11:38:28 UTC (rev 2015) @@ -1,317 +0,0 @@ -/* - * #%L - * I18n :: Maven Plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2007 - 2010 CodeLutin, Tony Chemit - * %% - * 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>. - * #L% - */ - -package org.nuiton.i18n.plugin.parser.impl; - -import org.apache.commons.lang3.StringUtils; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; -import org.nuiton.i18n.plugin.parser.I18nSourceEntry; -import org.nuiton.i18n.plugin.parser.SourceEntry; -import org.nuiton.io.FileUpdater; -import org.nuiton.io.MirroredFileUpdater; -import org.nuiton.plugin.PluginHelper; -import org.nuiton.processor.ProcessorUtil; -import org.nuiton.processor.filters.DefaultFilter; -import org.nuiton.processor.filters.Filter; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.xpath.XPath; -import java.io.File; -import java.io.IOException; - -/** - * Find i18n keys from jsp files. - * <p/> - * <b>Note: </b> this goal must always be invoked before the {@code process-resources} - * phase, otherwise all files will be considered as uptodate. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - * @deprecated since 2.5, hard to maintain jsp as valid xml docs. Will be removed soon - */ -@Mojo(name = "parserJsp", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) -public class ParserJspMojo extends AbstractParserXmlMojo { - - public static final String DEFAULT_INCLUDES = "**/*.jsp"; - - /** - * Root directory of the default entry. - * - * @since 2.0 - */ - @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/webapp", required = true) - protected File defaultBasedir; - - /** - * Default included files to process (ant-like expression). - * <p/> - * <strong>Note:</strong> default value is **\/*.jsp - * - * @since 2.0 - */ - @Parameter(property = "i18n.defaultIncludes", defaultValue = DEFAULT_INCLUDES, required = true) - protected String defaultIncludes; - - /** - * Defines the core rules file used to detect i18n keys in jsp files. - * <p/> - * <b>Note :</b> If you do not want to use it, set it to empty and fill the - * {@link #userRulesFiles} parameter. - * - * @since 2.0 - */ - @Parameter(property = "i18n.coreRuleFile") - protected String coreRuleFile; - - /** - * Defines the file name of the getter where to put detected i18n keys - * while getter phase. - * - * @since 2.0 - */ - @Parameter(property = "i18n.outputGetter", defaultValue = "jsp.getter", required = true) - protected String outputGetter; - - /** - * Where to generated temporary processed files. - * - * @since 2.0 - */ - @Parameter(property = "i18n.workdir", defaultValue = "${basedir}/target/i18n-workdir", required = true) - protected File workdir; - - @Override - public String[] getDefaultIncludes() { - return new String[]{defaultIncludes}; - } - - @Override - public String[] getDefaultExcludes() { - return I18nSourceEntry.EMPTY_STRING_ARRAY; - } - - @Override - public File getDefaultBasedir() { - return defaultBasedir; - } - - MirroredFileUpdater entryUpdater; - - @Override - protected boolean onEnterEntry(I18nSourceEntry entry) { - boolean b = super.onEnterEntry(entry); - if (!b) { - - // no skipped entry - // keep the file updater - entryUpdater = (MirroredFileUpdater) entry.getUpdater(); - } - return b; - } - - @Override - public FileUpdater newFileUpdater(SourceEntry entry) { - return new MirroredFileUpdater("", "", entry.getBasedir(), workdir) { - - @Override - public File getMirrorFile(File f) { - String file = - f.getAbsolutePath().substring(prefixSourceDirecotory); - return new File(destinationDirectory + File.separator + file + "~"); - } - }; - } - - @Override - protected String getOutGetter() { - return outputGetter; - } - - @Override - protected String getCoreRuleFile() { - return coreRuleFile; - } - - protected XmlFileParser newXmlFileParser(final XPath xpath, - final DocumentBuilder builder) { - - return new XmlFileParser(getLog(), - encoding, - oldParser, - acceptPattern, - showTouchedFiles, - rules, - xpath, - builder, - namespaces, - isVerbose()) { - - @Override - public File prepareFile(File file) throws IOException { - - // clean the jsp to make it xml - - File result = entryUpdater.getMirrorFile(file); - createDirectoryIfNecessary(result.getParentFile()); - JspFileProcessor processor = new JspFileProcessor(); - processor.process(file, result, getEncoding()); - String resultFileContent = - PluginHelper.readAsString(result, getEncoding()); - resultFileContent = resultFileContent.trim(); - - if (StringUtils.isBlank(resultFileContent)) { - - // nothing to scan inside this file - result = null; - } else { - - if (resultFileContent.startsWith("<html") || - resultFileContent.startsWith("<HTML") || - resultFileContent.startsWith("<?xml") - ) { - - // document should be well-formed... - - } else { - // to be sure, document is well formed, add a start and end tag - resultFileContent = "<div>\n" + resultFileContent + "\n</div>"; - - PluginHelper.writeString(result, resultFileContent, getEncoding()); - } - - } - - return result; - } - - @Override - public String extract(String i18nString) { - String s = null; - if (!StringUtils.isEmpty(i18nString.trim())) { - s = i18nString.trim(); - } - if (getLog().isDebugEnabled()) { - getLog().debug(i18nString + " = " + s); - } - return s; - } - - }; - } - - /** - * To transform jsp files to valid xml files. - * <p/> - * Says : - * <ul> - * <li>Remove jsp directive</li> - * <li>Remove jsp comment</li> - * <li>Remove any tags in attributes (used for example in struts)</li> - * <li>? Other thing</li> - * </ul> - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ - public static class JspFileProcessor extends ProcessorHelper.AbstractParserProcessor { - - protected ProcessorHelper.FragmentRemover remover1 = - new ProcessorHelper.FragmentRemover( - "<" + "%" + "-" + "-", - "-" + "-" + "%" + ">" - ); - - protected ProcessorHelper.FragmentRemover remover2 = - new ProcessorHelper.FragmentRemover( - "<" + "%", - "%" + ">" - ); - - protected ProcessorHelper.FragmentRemover remover3 = - new ProcessorHelper.FragmentRemover( - "<" + "!" + "-" + "-", - "-" + "-" + ">" - ); - - public JspFileProcessor() { - setInputFilter( - new Filter[]{ - remover1, - remover2, - remover3, - new JspAttributeWithTagFilter() - } - ); - } - - /** - * @param filein the source file to process - * @param fileout the output file to generate - * @param encoding encoding used to read and write files - * @throws IOException if any io problems while processing - * @since 1.0.4 - */ - @Override - public void process(File filein, - File fileout, - String encoding) throws IOException { - ProcessorUtil.doProcess(this, filein, fileout, encoding); - } - - /** - * To remove in attributes any sub tags inside it (used for example in - * struts) from jsp files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ - public static class JspAttributeWithTagFilter extends DefaultFilter { - - private String header = "=" + "\"" + "<"; - - private String footer = "\"" + "/" + ">" + "\""; - - @Override - protected String performInFilter(String ch) { - return "=\"\""; - } - - @Override - protected String performOutFilter(String ch) { - return ch; - } - - protected String getHeader() { - return header; - } - - protected String getFooter() { - return footer; - } - } - } -} Deleted: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2013-08-09 09:04:00 UTC (rev 2014) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2014-02-03 11:38:28 UTC (rev 2015) @@ -1,299 +0,0 @@ -/* - * #%L - * I18n :: Maven Plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 CodeLutin, Tony Chemit - * %% - * 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>. - * #L% - */ -package org.nuiton.i18n.plugin.parser.impl; - -import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; -import org.nuiton.i18n.plugin.parser.AbstractFileParser; -import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; -import org.nuiton.i18n.plugin.parser.FileParser; -import org.nuiton.i18n.plugin.parser.I18nSourceEntry; -import org.nuiton.i18n.plugin.parser.ParserException; -import org.nuiton.i18n.plugin.parser.SourceEntry; -import org.nuiton.io.FileUpdater; -import org.nuiton.io.MirroredFileUpdater; -import org.nuiton.io.SortedProperties; -import org.nuiton.processor.ProcessorUtil; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.util.HashSet; -import java.util.Set; -import java.util.regex.Pattern; - -/** - * To parse Tapestry templates to detect new I18n keys, says content of patterns : - * {@code ${message:XXX}} and {@code ${format:XXX=...}}. - * <p/> - * <p/> - * <b>Note: </b> this goal must always be invoked before the {@code process-resources} - * phase, otherwise all files will be considered as uptodate. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.1 - * @deprecated since 2.5, Not very usefull, since not very efficient, will be removed soon. - */ -@Mojo(name = "parserTapestry", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) -public class ParserTapestryMojo extends AbstractI18nParserMojo { - - public static final String DEFAULT_INCLUDES = "**/*.tml"; - - /** - * Root directory of the default entry. - * - * @since 2.1 - */ - @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/webapp", required = true) - protected File defaultBasedir; - - /** - * Default included files to process (ant-like expression). - * <p/> - * <strong>Note:</strong> default value is **\/*.tml - * - * @since 2.1 - */ - @Parameter(property = "i18n.defaultIncludes", defaultValue = DEFAULT_INCLUDES, required = true) - protected String defaultIncludes; - - /** - * Defines the file name of the getter where to put detected i18n keys - * while getter phase. - * - * @since 2.1 - */ - @Parameter(property = "i18n.outputGetter", defaultValue = "tapestry.getter", required = true) - protected String outputGetter; - - /** - * Where to generated temporary processed files. - * - * @since 2.1 - */ - @Parameter(property = "i18n.workdir", defaultValue = "${basedir}/target/i18n-workdir") - protected File workdir; - - protected MirroredFileUpdater entryUpdater; - - @Override - public String[] getDefaultIncludes() { - return new String[]{defaultIncludes}; - } - - @Override - public String[] getDefaultExcludes() { - return I18nSourceEntry.EMPTY_STRING_ARRAY; - } - - @Override - public File getDefaultBasedir() { - return defaultBasedir; - } - - @Override - protected boolean onEnterEntry(I18nSourceEntry entry) { - boolean b = super.onEnterEntry(entry); - if (!b) { - - // no skipped entry - // keep the file updater - entryUpdater = (MirroredFileUpdater) entry.getUpdater(); - } - return b; - } - - @Override - public FileUpdater newFileUpdater(SourceEntry entry) { - return new MirroredFileUpdater("", "", entry.getBasedir(), workdir) { - - @Override - public File getMirrorFile(File f) { - String file = - f.getAbsolutePath().substring(prefixSourceDirecotory); - return new File(destinationDirectory + File.separator + file); - } - }; - } - - @Override - protected String getOutGetter() { - return outputGetter; - } - - @Override - public FileParser newFileParser(Pattern acceptPattern) { - - return new TapestryFileParser(getLog(), - encoding, - oldParser, - acceptPattern, - isShowTouchedFiles() - ); - } - - protected class TapestryFileParser extends AbstractFileParser { - - - public TapestryFileParser(Log log, - String encoding, - SortedProperties oldParser, - Pattern acceptKeyPattern, - boolean showTouchedFiles) { - super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); - } - - - protected File prepareFile(File file) throws IOException { - - // clean the jsp to make it xml - - File result = entryUpdater.getMirrorFile(file); - if (isVerbose()) { - getLog().info("Will process [" + file + "] to " + result); - } - try { - createDirectoryIfNecessary(result.getParentFile()); - } catch (IOException e) { - // don't care about it... - } - TapestryFileProcessor processor = new TapestryFileProcessor(); - processor.setVerbose(isVerbose()); - processor.process(file, result, getEncoding()); - return result; - } - - @Override - public void parseFile(File file) throws IOException { - - // clean the jsp to make it xml - - File processedFile = prepareFile(file); - - // process file to obtain - String line = null; - LineNumberReader lnr = new LineNumberReader(new InputStreamReader( - new FileInputStream(processedFile), getEncoding())); - try { - while ((line = lnr.readLine()) != null) { - parseLine(processedFile, line); - } - } catch (Exception e) { - if (line != null) { - getLog().error( - "could not parse line (" + lnr.getLineNumber() + ") '" - + line + "' of file " + file); - } - throw new ParserException(e); - } finally { - lnr.close(); - } - } - - @Override - public void parseLine(File file, String line) throws IOException { - - String key = line.trim(); - - if (key.isEmpty()) { - // no key detected on this line - return; - } - -// // one key found in file, so file is marked as touched -// setTouched(true); - // Found a i18n key, register it. - if (getLog().isDebugEnabled()) { - getLog().debug(file.getName() + " detected key = " + key); - } - registerKey(key); - } - } - - /** - * To Extract i18n keys from tapestry template files. - * <p/> - * Says : - * <ul> - * <li>Remove all xml comments</li> - * <li>Keep content of {@code ${message:XXX}}</li> - * <li>Keep content of {@code ${format:XXX}}}</li> - * </ul> - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.1 - */ - public static class TapestryFileProcessor extends ProcessorHelper.AbstractParserProcessor { - - protected ProcessorHelper.FragmentRemover remover1 = - new ProcessorHelper.FragmentRemover( - "<" + "!" + "-" + "-", - "-" + "-" + ">" - ); - - protected ProcessorUtil.FragmentExtractor extractor1 = - new ProcessorUtil.FragmentExtractor( - "$" + "{" + "m" + "e" + "s" + "s" + "a" + "g" + "e" + ":", - "}" - ); - - protected ProcessorUtil.FragmentExtractor extractor2 = - new ProcessorUtil.FragmentExtractor( - "$" + "{" + "f" + "o" + "r" + "m" + "a" + "t" + ":", - "}") { - - @Override - protected String performInFilter(String ch) { - int i = ch.indexOf('='); - if (verbose) { - log.info("Detected key " + ch); - } - if (i == -1) { - return ""; - } - return ch.substring(0, i) + "\n"; - } - }; - - - public void process(File filein, - File fileout, - String encoding) throws IOException { - - // remove comment fragments - File fileTemp = new File(fileout.getAbsolutePath() + "-no-comment"); - removefragments(remover1, filein, fileTemp, encoding, false); - - Set<String> keys = new HashSet<String>(); - extractKeys(extractor1, fileTemp, encoding, verbose, keys); - extractKeys(extractor2, fileTemp, encoding, verbose, keys); - saveKeysToFile(fileout, keys); - } - } -}

1 0

Build failed in Jenkins: i18n #1
by admin+ci-nuiton.org＠codelutin.com 25 Jan '14

25 Jan '14

See <http://ci-ng.nuiton.org/jenkins/job/i18n/1/> ------------------------------------------ [...truncated 687 lines...] [INFO] [INFO] --- maven-plugin-plugin:3.2:helpmojo (default) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to read mojo metadata. [INFO] Applying mojo extractor for language: java-annotations [INFO] Mojo extractor for language: java-annotations found 0 mojo descriptors. [INFO] Applying mojo extractor for language: java [INFO] Mojo extractor for language: java found 0 mojo descriptors. [INFO] Applying mojo extractor for language: bsh [INFO] Mojo extractor for language: bsh found 0 mojo descriptors. [INFO] [INFO] --- maven-plugin-plugin:3.2:descriptor (default-descriptor) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to read mojo metadata. [INFO] Applying mojo extractor for language: java-annotations [INFO] Mojo extractor for language: java-annotations found 0 mojo descriptors. [INFO] Applying mojo extractor for language: java [INFO] Mojo extractor for language: java found 0 mojo descriptors. [INFO] Applying mojo extractor for language: bsh [INFO] Mojo extractor for language: bsh found 0 mojo descriptors. [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 5 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ i18n-maven-plugin --- [INFO] Compiling 30 source files to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] [INFO] --- plexus-component-metadata:1.5.5:generate-metadata (default) @ i18n-maven-plugin --- [INFO] Discovered 1 component descriptors(s) [INFO] [INFO] --- maven-plugin-plugin:3.2:descriptor (default) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to read mojo metadata. [INFO] Applying mojo extractor for language: java-annotations [INFO] Mojo extractor for language: java-annotations found 14 mojo descriptors. [INFO] Applying mojo extractor for language: java [INFO] Mojo extractor for language: java found 0 mojo descriptors. [INFO] Applying mojo extractor for language: bsh [INFO] Mojo extractor for language: bsh found 0 mojo descriptors. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ i18n-maven-plugin --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ i18n-maven-plugin --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ i18n-maven-plugin --- [INFO] Compiling 4 source files to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] [INFO] --- maven-surefire-plugin:2.15:test (default-test) @ i18n-maven-plugin --- [INFO] Surefire report directory: <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running org.nuiton.i18n.plugin.parser.impl.Struts2JspFileParserTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.043 sec - in org.nuiton.i18n.plugin.parser.impl.Struts2JspFileParserTest Running org.nuiton.i18n.plugin.parser.impl.JavaFileParserTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in org.nuiton.i18n.plugin.parser.impl.JavaFileParserTest Running org.nuiton.i18n.plugin.parser.SourceEntryTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.008 sec - in org.nuiton.i18n.plugin.parser.SourceEntryTest Running org.nuiton.i18n.plugin.bundle.StringFormatToMessageFormatConverterTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.059 sec - in org.nuiton.i18n.plugin.bundle.StringFormatToMessageFormatConverterTest Results : Tests run: 6, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ i18n-maven-plugin --- [INFO] Building jar: <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] [INFO] --- maven-plugin-plugin:3.2:addPluginArtifactMetadata (default-addPluginArtifactMetadata) @ i18n-maven-plugin --- [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ i18n-maven-plugin --- [INFO] [INFO] --- maven-invoker-plugin:1.8:install (integration-test) @ i18n-maven-plugin --- [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/pom.xml> to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/target/i18n-2.5.3-SNAPSHO…> to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/target/i18n-2.5.3-SNAPSHO…> to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/nuiton-i18n/pom.xml> to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/nuiton-i18n/target/nuiton…> to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/pom.xml> to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] Installing <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/i18n-maven-plugin/target/…> [INFO] [INFO] --- maven-invoker-plugin:1.8:run (integration-test) @ i18n-maven-plugin --- [INFO] Building: evo-1507/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (4.9 s) [INFO] Building: ano-672/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (6.2 s) [INFO] Building: parsers/withNewKeys/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (3.6 s) [INFO] Building: parsers/newProject/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (3.3 s) [INFO] Building: ano-1494/migrate/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (2.8 s) [INFO] Building: ano-1494/iso-8859-1/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (3.6 s) [INFO] Building: ano-1494/utf-8/pom.xml [INFO] run script verify.groovy [INFO] ..SUCCESS (3.9 s) [INFO] ------------------------------------------------- [INFO] Build Summary: [INFO] Passed: 7, Failed: 0, Errors: 0, Skipped: 0 [INFO] ------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] I18n .............................................. SUCCESS [2.848s] [INFO] I18n :: Api ....................................... SUCCESS [3.510s] [INFO] I18n :: Maven Plugin .............................. SUCCESS [33.269s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 40.868s [INFO] Finished at: Sun Jan 26 00:31:03 CET 2014 [INFO] Final Memory: 48M/694M [INFO] ------------------------------------------------------------------------ channel stopped [trunk] $ /opt/maven3/bin/mvn -f pom.xml -s /var/local/forge/data/nuiton.org/maven/settings.xml -e clean deploy -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] I18n [INFO] I18n :: Api [INFO] I18n :: Maven Plugin [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building I18n 2.5.3-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-install-… 4/7 KB 7/7 KB Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-install-… (7 KB at 49.5 KB/sec) Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-install-… 4/27 KB 8/27 KB 12/27 KB 14/27 KB 18/27 KB 20/27 KB 21/27 KB 25/27 KB 27/27 KB Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-install-… (27 KB at 658.0 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ i18n --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ i18n --- [INFO] [INFO] --- helper-maven-plugin:2.1:check-auto-container (check-central-safe) @ i18n --- [INFO] Will use repository http://repo1.maven.org/maven2/ [INFO] Will use repository http://maven.nuiton.org/central-releases [INFO] 14 dependencies to check. [INFO] 14 artifact(s) resolved by repository http://repo1.maven.org/maven2/ in 2.114s [INFO] All dependencies are safe. [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ i18n --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ i18n --- [INFO] Exporting server [redmine-nuiton.org] username in ${redmine.username} [INFO] Exporting server [redmine-nuiton.org] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ i18n --- [INFO] Will create or update license file [lgpl_v3] to <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/LICENSE.txt> [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ i18n --- [WARNING] The goal is skip due to packaging 'pom' [INFO] [INFO] --- license-maven-plugin:1.5:update-file-header (update-file-header) @ i18n --- [INFO] Will search files to update from root <http://ci-ng.nuiton.org/jenkins/job/i18n/ws/trunk/src> [INFO] Scan 16 files header done in 90.952ms. [INFO] All files are up-to-date. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.9:check (default) @ i18n --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ i18n --- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] I18n .............................................. FAILURE [5.190s] [INFO] I18n :: Api ....................................... SKIPPED [INFO] I18n :: Maven Plugin .............................. SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 5.699s [INFO] Finished at: Sun Jan 26 00:31:11 CET 2014 [INFO] Final Memory: 27M/429M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project i18n: the user 'ci' could not be retrieve from redmine server. -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project i18n: the user 'ci' could not be retrieve from redmine server. at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:555) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:214) at org.apache.maven.cli.MavenCli.main(MavenCli.java:158) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356) Caused by: org.apache.maven.plugin.MojoExecutionException: the user 'ci' could not be retrieve from redmine server. at org.nuiton.jredmine.plugin.AbstractRedmineMojo.failIfSafe(AbstractRedmineMojo.java:396) at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProject.init(AbstractRedmineMojoWithProject.java:114) at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProjectAndVersion.init(AbstractRedmineMojoWithProjectAndVersion.java:101) at org.nuiton.jredmine.plugin.GenerateChangesMojo.init(GenerateChangesMojo.java:348) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:106) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 19 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Build step 'Invoke top-level Maven targets' marked build as failure

1 0

r2014 - in trunk: . i18n-maven-plugin nuiton-i18n
by tchemit＠users.nuiton.org 09 Aug '13

09 Aug '13

Author: tchemit Date: 2013-08-09 11:04:00 +0200 (Fri, 09 Aug 2013) New Revision: 2014 Url: http://nuiton.org/projects/i18n/repository/revisions/2014 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/i18n-maven-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2013-07-18 13:28:42 UTC (rev 2013) +++ trunk/i18n-maven-plugin/pom.xml 2013-08-09 09:04:00 UTC (rev 2014) @@ -20,11 +20,10 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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> - -  -  <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> @@ -32,13 +31,8 @@ </parent> <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> -  -  + <artifactId>i18n-maven-plugin</artifactId> <packaging>maven-plugin</packaging> - -  -  <name>I18n :: Maven Plugin</name> <description> Maven plugin to deal with i18n stuff in a project, mainly base on the @@ -46,6 +40,11 @@ </description> <inceptionYear>2007</inceptionYear> + <properties> + +  + <skipPostRelease>false</skipPostRelease> + </properties> <dependencies> <dependency> @@ -78,7 +77,7 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> - + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> @@ -137,7 +136,7 @@ <artifactId>log4j</artifactId> <scope>runtime</scope> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -181,7 +180,7 @@ <profiles> -  +  <profile> <id>reporting</id> <activation> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2013-07-18 13:28:42 UTC (rev 2013) +++ trunk/nuiton-i18n/pom.xml 2013-08-09 09:04:00 UTC (rev 2014) @@ -20,11 +20,11 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - -  -  + <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> @@ -33,15 +33,10 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> - -  -  <name>I18n :: Api</name> <description>Api of i18n system</description> <inceptionYear>2004</inceptionYear> - -  -  + <properties>  @@ -83,9 +78,7 @@ </dependency> </dependencies> - -  -  + <profiles>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-18 13:28:42 UTC (rev 2013) +++ trunk/pom.xml 2013-08-09 09:04:00 UTC (rev 2014) @@ -23,25 +23,20 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - -  -  + <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <artifactId>i18n</artifactId> - <version>2.5.3-SNAPSHOT</version> -  -  + <version>2.5.3-SNAPSHOT</version> <packaging>pom</packaging> - -  -  <name>I18n</name> <description>Nuiton i18n tools</description> <url>http://maven-site.nuiton.org/i18n</url> @@ -51,11 +46,7 @@ <module>nuiton-i18n</module> <module>i18n-maven-plugin</module> </modules> - -  -  -  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> <developerConnection>

1 0

r2013 - in trunk: . i18n-maven-plugin nuiton-i18n
by maven-release＠users.nuiton.org 18 Jul '13

18 Jul '13

Author: maven-release Date: 2013-07-18 15:28:42 +0200 (Thu, 18 Jul 2013) New Revision: 2013 Url: http://nuiton.org/projects/i18n/repository/revisions/2013 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/i18n-maven-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2013-07-18 13:28:39 UTC (rev 2012) +++ trunk/i18n-maven-plugin/pom.xml 2013-07-18 13:28:42 UTC (rev 2013) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2013-07-18 13:28:39 UTC (rev 2012) +++ trunk/nuiton-i18n/pom.xml 2013-07-18 13:28:42 UTC (rev 2013) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-18 13:28:39 UTC (rev 2012) +++ trunk/pom.xml 2013-07-18 13:28:42 UTC (rev 2013) @@ -35,7 +35,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version>   <packaging>pom</packaging> @@ -57,11 +57,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.5.2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.5.2 + scm:svn:http://svn.nuiton.org/svn/i18n/trunk </developerConnection> - <url>http://nuiton.org/projects/i18n/repository/show/tags/i18n-2.5.2</url> + <url>http://nuiton.org/projects/i18n/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r2012 - tags
by maven-release＠users.nuiton.org 18 Jul '13

18 Jul '13

Author: maven-release Date: 2013-07-18 15:28:39 +0200 (Thu, 18 Jul 2013) New Revision: 2012 Url: http://nuiton.org/projects/i18n/repository/revisions/2012 Log: [maven-release-plugin] copy for tag i18n-2.5.2 Added: tags/i18n-2.5.2/

1 0