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

r1978 - trunk
by tchemit＠users.nuiton.org 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:42:55 +0200 (Thu, 30 Aug 2012) New Revision: 1978 Url: http://nuiton.org/repositories/revision/i18n/1978 Log: Update mavenpom4redmineAndCentral to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-29 21:25:39 UTC (rev 1977) +++ trunk/pom.xml 2012-08-30 14:42:55 UTC (rev 1978) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.3.7</version> </parent> <artifactId>i18n</artifactId>

1 0

r1977 - in trunk: i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 23:25:39 +0200 (Wed, 29 Aug 2012) New Revision: 1977 Url: http://nuiton.org/repositories/revision/i18n/1977 Log: fixes #2291: Generate a csv file with all translations for all locales in a csv file in bundle mojo Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java 2012-08-29 21:25:39 UTC (rev 1977) @@ -147,7 +147,7 @@ /** * The definitive directory where to generate the bundles (includes the - * package of bunlde). + * package of bundle). * * @since 2.3.2 */ Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2012-08-29 21:25:39 UTC (rev 1977) @@ -25,6 +25,7 @@ package org.nuiton.i18n.plugin.bundle; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; @@ -39,18 +40,23 @@ import org.nuiton.io.SortedProperties; import org.nuiton.plugin.PluginHelper; +import java.io.BufferedWriter; import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.net.URL; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import java.util.Set; /** * Generate an aggregate i18n bundle for all dependencies of the project. @@ -88,6 +94,36 @@ protected boolean generateDefinitionFile; /** + * A flag to generate the i18n csv file wich contains all translation for + * all locales. + * + * Useful to translate from a language to another one. + * + * @since 2.5 + */ + @Parameter(property = "i18n.generateCsvFile", defaultValue = "false") + protected boolean generateCsvFile; + + /** + * Location of the csv file to generate if parameter + * {@link #generateCsvFile} is on. + * + * @since 2.5 + */ + @Parameter(property = "i18n.bundleCsvFile", + defaultValue = "${basedir}/target/${project.artifactId}-i18n.csv") + protected File bundleCsvFile; + + /** + * Char separator used when generating the csf bundle file if parameter + * {@link #generateCsvFile} is on. + * + * @since 2.5 + */ + @Parameter(property = "i18n.bundleCsvSeparator", defaultValue = "\t") + protected String bundleCsvSeparator; + + /** * Converter used to change format of bundles. * * @since 2.4 @@ -242,6 +278,11 @@ generateDefinitionFile(version, bundleDico); } + + if (generateCsvFile) { + generateCsvFile(); + } + if (!silent && verbose) { getLog().info("done in " + PluginHelper.convertTime(t00, System.nanoTime())); @@ -304,4 +345,69 @@ } } + /** + * Generates a csv file with all translations. + * + * First column is key, second is first locale translation, ... + * + * @throws IOException if any IO problem while the copy. + * @since 2.5 + */ + protected void generateCsvFile() throws IOException { + + if (!bundleCsvFile.exists()) { + createNewFile(bundleCsvFile); + } + + Set<String> allKeys = new HashSet<String>(); + Map<Locale, SortedProperties> bundlesByLocale = + new LinkedHashMap<Locale, SortedProperties>(); + for (Locale locale : locales) { + File bundleFile = getBundleFile(outputFolder, + bundleOutputName, + locale, + false + ); + + SortedProperties properties = new SortedProperties(bundleOutputEncoding); + properties.load(bundleFile); + for (Object o : properties.keySet()) { + allKeys.add((String) o); + } + bundlesByLocale.put(locale, properties); + } + List<String> keys = new ArrayList<String>(allKeys); + Collections.sort(keys); + + BufferedWriter writer = new BufferedWriter(new FileWriter(bundleCsvFile)); + try { + // add header line + StringBuilder builder = new StringBuilder("Key"); + for (Locale locale : locales) { + builder.append(bundleCsvSeparator).append(locale.getCountry()); + } + writer.write(builder.toString()); + + // for each key get all translations for all + for (String key : keys) { + writer.newLine(); + builder = new StringBuilder(key); + for (Locale locale : locales) { + SortedProperties properties = bundlesByLocale.get(locale); + Object value = properties.get(key); + builder.append(bundleCsvSeparator); + builder.append(value == null ? "" : value); + } + writer.write(builder.toString()); + } + writer.close(); + } finally { + IOUtils.closeQuietly(writer); + } + + if (!isSilent()) { + getLog().info("Generate csv bundle file at " + bundleCsvFile); + } + } + } Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/src/site/apt/index.apt 2012-08-29 21:25:39 UTC (rev 1977) @@ -77,6 +77,16 @@ Cela permet de limiter les clefs entrantes (ce qui est nécessaire pour le parseur struts2...) +* Permettre de générer un fichier csv avec toutes les traductions d'un bundle + + Cela peut aider grandement à compléter les traduction à partir des + traductions complètes d'une langue. + + Pour utiliser cette fonctionnalité, il suffit d'ajouter à la ligne de + commande <-Di18n.generateCsvFile> lors de l'execution du mojo <bundle>. + + See {{{http://nuiton.org/issues/2291}Evolution #2291: Generate a csv file with all translations for all locales in a csv file in bundle mojo}}. + Quoi de neuf dans la version 2.4 * Meilleure utilisation des encodings Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2012-08-29 20:33:23 UTC (rev 1976) +++ trunk/src/site/en/apt/index.apt 2012-08-29 21:25:39 UTC (rev 1977) @@ -75,6 +75,14 @@ This permits to limit incoming keys by a regex. +* Can generate a csv file from the generated bundle for all locales. + + This can help people to translate missing keys. + + To use this just add *-Di18n.generateCsvFile* on the bundle mojo. + + See {{{http://nuiton.org/issues/2291}Evolution #2291: Generate a csv file with all translations for all locales in a csv file in bundle mojo}}. + What's new in 2.4 version * Better usage of encodings @@ -109,14 +117,6 @@ another one, using a different syntax from the one used by translations will not work properly. -What's new in 2.5 version - -* Plugin module renamed to i18n-maven-plugin. - - the i18n maven plugin was renamed from <maven-i18n-plugin> to <i18n-maven-plugin>. - - Think to update your poms. - What's new in 2.3 version Version 2.3 improves a lot performance on detection of java file i18n keys

1 0

r1976 - in trunk/i18n-maven-plugin/src: main/java/org/nuiton/i18n/plugin/parser/impl test/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 22:33:23 +0200 (Wed, 29 Aug 2012) New Revision: 1976 Url: http://nuiton.org/repositories/revision/i18n/1976 Log: fixes #2290: Introduce a simple struts2 jsp parser Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 20:20:51 UTC (rev 1975) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 20:33:23 UTC (rev 1976) @@ -134,7 +134,7 @@ * @since 2.5 */ protected final Pattern i18nPattern = - Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\"|(?:text\\s*name='|key=')(.*?)'"); + Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\"|(?:%\\{getText\\('|text\\s*name='|key=')(.*?)'"); public Struts2JspFileParser(Log log, String encoding, Modified: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java 2012-08-29 20:20:51 UTC (rev 1975) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java 2012-08-29 20:33:23 UTC (rev 1976) @@ -99,19 +99,16 @@ line = "key=\"key22\" label='%{getText(\"i18n.key2\")}'/> "; parseLine(file, line, "i18n.key2"); - } - @Test - public void getKeys2() throws IOException { - - String line; - File file = new File("getKeys2"); - line = "<s:text name=\"i18n.key3\"/>"; parseLine(file, line, "i18n.key3"); line = "<s:text key='i18n.key4'/>"; parseLine(file, line, "i18n.key4"); + + line = "key=\"key52\" label=\"%{getText('i18n.key5')}\"/> "; + parseLine(file, line, "i18n.key5"); + } protected void parseLine(File f, String line, String... expectedKeys) throws IOException {

1 0

r1975 - trunk/nuiton-i18n-editor
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 22:20:51 +0200 (Wed, 29 Aug 2012) New Revision: 1975 Url: http://nuiton.org/repositories/revision/i18n/1975 Log: use last stable of jaxx Modified: trunk/nuiton-i18n-editor/pom.xml Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2012-08-29 20:18:09 UTC (rev 1974) +++ trunk/nuiton-i18n-editor/pom.xml 2012-08-29 20:20:51 UTC (rev 1975) @@ -93,7 +93,7 @@  <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxxVersion>2.5.1-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.5</jaxxVersion> <nuitonUtilsVersion>1.2</nuitonUtilsVersion>

1 0

r1974 - trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 22:18:09 +0200 (Wed, 29 Aug 2012) New Revision: 1974 Url: http://nuiton.org/repositories/revision/i18n/1974 Log: refs #2290: Introduce a simple struts2 jsp parser Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 20:13:39 UTC (rev 1973) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 20:18:09 UTC (rev 1974) @@ -43,7 +43,6 @@ 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; @@ -132,14 +131,11 @@ /** * Pattern used to detect i18n keys. * - * @since 2.3 + * @since 2.5 */ protected final Pattern i18nPattern = - Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\""); + Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\"|(?:text\\s*name='|key=')(.*?)'"); - protected final Pattern i18nPattern2 = - Pattern.compile("(?:text\\s*name='|key=')(.*?)'"); - public Struts2JspFileParser(Log log, String encoding, SortedProperties oldParser, @@ -178,34 +174,17 @@ Matcher matcher = i18nPattern.matcher(line); - boolean match = false; while (matcher.find()) { - match = true; String key = matcher.group(1); + if (key == null) { + key = matcher.group(2); + } if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key); } // register key registerKey(key); } - - if (!match) { - - // try with second pattern - matcher = i18nPattern2.matcher(line); - - while (matcher.find()) { - String key = matcher.group(1); - if (getLog().isDebugEnabled()) { - getLog().debug(file.getName() + " detected key = " + key); - } -// // one key found in file, so file is marked as touched -// setTouched(true); - - // register key - registerKey(key); - } - } } }

1 0

r1973 - in trunk/src/site: apt en/apt
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 22:13:39 +0200 (Wed, 29 Aug 2012) New Revision: 1973 Url: http://nuiton.org/repositories/revision/i18n/1973 Log: complete 2.5 doc Modified: trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2012-08-29 19:51:09 UTC (rev 1972) +++ trunk/src/site/apt/index.apt 2012-08-29 20:13:39 UTC (rev 1973) @@ -58,7 +58,25 @@ Pensez à mettre à jour vos pom. +* Ajout d'un parseur pour les jsp de struts2 + Ce nouveau parseur scan les fichier jsp et extrait toutes les clefs + contenues dans des attributs text name='xxx' ou label='xxx' ou %{getText("xxx". + + Malheureusement il n'est pas possible de faire mieux que ça et il se peut + alors de récupérer trop de clefs. Pour limiter cet effet indésirable il est + possible d'utiliser le nouveau paramètre <acceptKeyformat> qui permet de + limiter les clefs remontées. + + De toute manière il ne faut pas oublier qu'une bnne pratique est de toujours + utiliser un prefixe commun à toutes les clefs de traduction (donc le pattern + doit rester simple à écrire). + +* Ajout d'un paramètre <acceptKeyFormat> sur les goals de type parser + + Cela permet de limiter les clefs entrantes (ce qui est nécessaire pour le + parseur struts2...) + Quoi de neuf dans la version 2.4 * Meilleure utilisation des encodings Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2012-08-29 19:51:09 UTC (rev 1972) +++ trunk/src/site/en/apt/index.apt 2012-08-29 20:13:39 UTC (rev 1973) @@ -51,6 +51,30 @@ - {{{./maven-i18n-plugin/index.html}I18n Maven Plugin}} +What's new in 2.5 version + +* Plugin was renamed to i18n-maven-plugin. + + the plugin was renamed from <maven-i18n-plugin> to <i18n-maven-plugin>. + + think to update your poms. + +* Add a struts2 jsp parser + + this new parseur scan jsp files to extract keys which match these forms: + text name='xxx' or label='xxx' or %{getText("xxx". + + Unfortunatly, we can't do better than this, and still we detects too much keys. + To avoid this problem we had a new paramter (see next section) to restrict + accepted incoming keys. + + anyway, always keep in mind that a good pratice is to use a common i18n + prefix for all your keys, so the pattern should not be so harde to write ;) + +* Add a new parameter <acceptKeyFormat> on parser-like goals + + This permits to limit incoming keys by a regex. + What's new in 2.4 version * Better usage of encodings

1 0

r1972 - trunk/i18n-maven-plugin
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 21:51:09 +0200 (Wed, 29 Aug 2012) New Revision: 1972 Url: http://nuiton.org/repositories/revision/i18n/1972 Log: fix dependencies Modified: trunk/i18n-maven-plugin/pom.xml Modified: trunk/i18n-maven-plugin/pom.xml =================================================================== --- trunk/i18n-maven-plugin/pom.xml 2012-08-29 19:38:52 UTC (rev 1971) +++ trunk/i18n-maven-plugin/pom.xml 2012-08-29 19:51:09 UTC (rev 1972) @@ -101,6 +101,20 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> + <exclusions> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> + <exclusion> + <groupId>ognl</groupId> + <artifactId>ognl</artifactId> + </exclusion> + </exclusions> </dependency>

1 0

r1971 - in trunk/i18n-maven-plugin/src: main/java/org/nuiton/i18n/plugin/parser main/java/org/nuiton/i18n/plugin/parser/impl test/java/org/nuiton/i18n/plugin/parser test/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 21:38:52 +0200 (Wed, 29 Aug 2012) New Revision: 1971 Url: http://nuiton.org/repositories/revision/i18n/1971 Log: fixes #2288: Add a acceptKeyFormat in parsers mojo to filter which incoming keys can be kept Added: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 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/ParserValidationMojo.java trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -30,8 +30,9 @@ import java.io.File; import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; - /** * A abstract implementation of a {@link FileParser} with no logic. * @@ -53,15 +54,19 @@ private final String encoding; + protected final Pattern acceptKeyPattern; + protected AbstractFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { this.log = log; this.oldParser = oldParser; this.showTouchedFiles = showTouchedFiles; this.encoding = encoding; result = new SortedProperties(encoding); + this.acceptKeyPattern = acceptKeyPattern; } public boolean isShowTouchedFiles() { @@ -104,6 +109,13 @@ * @param key the i18n key to register */ protected void registerKey(String key) { + if (acceptKeyPattern != null) { + Matcher matcher = acceptKeyPattern.matcher(key); + if (!matcher.matches()) { + return; + } + } + Object value = oldParser.get(key); if (value == null) { // nouvelle clef du parser, on utilise la clef comme valeur @@ -112,6 +124,9 @@ // register result getResult().put(key, value); + // one key found in file, so file is marked as touched + setTouched(true); + //old code with event // String keyModified = key; // for (ParserEvent event : events) { Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -34,6 +34,7 @@ import java.io.File; import java.io.IOException; import java.util.List; +import java.util.regex.Pattern; /** * Abstract implementation for parsing goal. @@ -55,10 +56,11 @@ protected abstract File getDefaultBasedir(); /** + * @param acceptPattern optional pattern to accept incoming keys * @return a new file parser to be used in the parser consumer parserExecutor * @since 1.2 */ - public abstract FileParser newFileParser(); + public abstract FileParser newFileParser(Pattern acceptPattern); /** * @param entry the incoming source entry to attach to the file updater @@ -108,6 +110,18 @@ @Parameter(property = "i18n.force", defaultValue = "false") protected boolean force; + /** + * A regex pattern to accept incoming keys. + * + * Only incoming keys which match the pattern will be kept. + * + * @since 2.5 + */ + @Parameter(property = "i18n.acceptKeyFormat") + protected String acceptKeyFormat; + + protected Pattern acceptPattern; + private SortedProperties result; protected SortedProperties oldParser; @@ -160,6 +174,10 @@ } } + if (acceptKeyFormat != null) { + acceptPattern = Pattern.compile(acceptKeyFormat); + } + parserExecutor = new ParserExecutor(this); } @@ -225,7 +243,7 @@ String fileName = entry.getBasedir().getAbsolutePath() + File.separator + file1; File file = new File(fileName); - parserExecutor.addFile(newFileParser(), file); + parserExecutor.addFile(newFileParser(acceptPattern), file); } } Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -60,6 +60,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.regex.Pattern; /** * Abstract xml parser mojo. @@ -166,7 +167,7 @@ } @Override - public final FileParser newFileParser() { + public final FileParser newFileParser(Pattern acceptPattern) { DocumentBuilder builder; try { @@ -312,13 +313,14 @@ public XmlFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles, String rules, XPath xpath, DocumentBuilder builder, Map<String, String> namespaces, boolean verbose) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); this.xpath = xpath; this.rules = rules; this.builder = builder; @@ -408,7 +410,7 @@ key = extract(key); if (key != null) { - setTouched(true); +// setTouched(true); registerKey(key); } } Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -45,7 +45,9 @@ import java.io.InputStreamReader; import java.io.LineNumberReader; import java.util.HashSet; +import java.util.List; import java.util.Set; +import java.util.regex.Pattern; /** * To detect from GWT java files new I18n keys, says content of patterns : @@ -142,11 +144,12 @@ } @Override - public FileParser newFileParser() { + public FileParser newFileParser(Pattern acceptPattern) { return new GWTJavaFileParser(getLog(), encoding, oldParser, + acceptPattern, isShowTouchedFiles() ); } @@ -157,8 +160,9 @@ public GWTJavaFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern,showTouchedFiles); } @@ -218,8 +222,8 @@ return; } - // one key found in file, so file is marked as touched - setTouched(true); +// // 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); 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 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -44,6 +44,7 @@ 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; @@ -108,11 +109,12 @@ } @Override - public FileParser newFileParser() { + public FileParser newFileParser(Pattern acceptPattern) { return new JavaFileParser(getLog(), encoding, oldParser, + acceptPattern, isShowTouchedFiles() ); } @@ -130,8 +132,9 @@ public JavaFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); } public Pattern getI18nPattern() { @@ -170,8 +173,8 @@ if (getLog().isDebugEnabled()) { getLog().debug(file.getName() + " detected key = " + key); } - // one key found in file, so file is marked as touched - setTouched(true); +// // one key found in file, so file is marked as touched +// setTouched(true); // register key registerKey(key); Added: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java (rev 0) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -0,0 +1,212 @@ +package org.nuiton.i18n.plugin.parser.impl; + +/* + * #%L + * I18n :: Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +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 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; + +/** + * To parse struts2 jsp and obtain all keys. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5 + */ +@Mojo(name = "parserStruts2", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) +public class ParserStruts2Mojo extends AbstractI18nParserMojo { + + public static final String DEFAULT_INCLUDES = "**/*.jsp"; + + /** Root directory of the default entry. */ + @Parameter(property = "i18n.defaultBasedir", defaultValue = "${basedir}/src/main/webapp") + protected File defaultBasedir; + + /** + * Default included files to process (ant-like expression). + * + * Note: default value is **\/*.jsp + */ + @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.0 + */ + @Parameter(property = "i18n.outputGetter", defaultValue = "struts2.getter") + protected String outputGetter; + + /** Exploded war Build directory (used to know if files in sources are up-to-date). */ + @Parameter(property = "i18n.explodedWarPath", defaultValue = "${project.build.directory}/${project.artifactId}-{project.version}") + protected File explodedWarPath; + + @Override + public String[] getDefaultIncludes() { + return new String[]{defaultIncludes}; + } + + @Override + public String[] getDefaultExcludes() { + return I18nSourceEntry.EMPTY_STRING_ARRAY; + } + + @Override + public File getDefaultBasedir() { + return defaultBasedir; + } + + @Override + public FileUpdater newFileUpdater(SourceEntry entry) { + return new MirroredFileUpdater("", "", entry.getBasedir(), explodedWarPath) { + + @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 Struts2JspFileParser(getLog(), + encoding, + oldParser, + acceptPattern, + isShowTouchedFiles() + ); + } + + protected static class Struts2JspFileParser extends AbstractFileParser { + + /** + * Pattern used to detect i18n keys. + * + * @since 2.3 + */ + protected final Pattern i18nPattern = + Pattern.compile("(?:%\\{getText\\(\\\"|text name=\\\"|key=\\\")(.*?)\""); + + protected final Pattern i18nPattern2 = + Pattern.compile("(?:text\\s*name='|key=')(.*?)'"); + + public Struts2JspFileParser(Log log, + String encoding, + SortedProperties oldParser, + Pattern acceptKeyPattern, + boolean showTouchedFiles) { + 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())); + 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); + } + throw new ParserException(e); + } finally { + lnr.close(); + } + } + + @Override + public void parseLine(File file, String line) throws IOException { + + Matcher matcher = i18nPattern.matcher(line); + + boolean match = false; + while (matcher.find()) { + match = true; + String key = matcher.group(1); + if (getLog().isDebugEnabled()) { + getLog().debug(file.getName() + " detected key = " + key); + } + // register key + registerKey(key); + } + + if (!match) { + + // try with second pattern + matcher = i18nPattern2.matcher(line); + + while (matcher.find()) { + String key = matcher.group(1); + if (getLog().isDebugEnabled()) { + getLog().debug(file.getName() + " detected key = " + key); + } +// // one key found in file, so file is marked as touched +// setTouched(true); + + // register key + registerKey(key); + } + } + } + } + +} \ No newline at end of file Property changes on: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -154,6 +154,7 @@ return new XmlFileParser(getLog(), encoding, oldParser, + acceptPattern, showTouchedFiles, rules, xpath, Modified: trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java =================================================================== --- trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -108,6 +108,7 @@ XmlFileParser fileParser = new XmlFileParser(getLog(), encoding, oldParser, + acceptPattern, showTouchedFiles, rules, xpath, Modified: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -1,5 +1,29 @@ package org.nuiton.i18n.plugin.parser; +/* + * #%L + * I18n :: Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.junit.Assert; import org.junit.Test; import org.nuiton.i18n.plugin.parser.impl.ParserJavaMojo; Property changes on: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2012-08-29 19:38:13 UTC (rev 1970) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -64,6 +64,7 @@ log, ENCODING, oldParser, + null, false) { @Override protected void registerKey(String key) { Added: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java =================================================================== --- trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java (rev 0) +++ trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java 2012-08-29 19:38:52 UTC (rev 1971) @@ -0,0 +1,126 @@ +package org.nuiton.i18n.plugin.parser.impl; + +/* + * #%L + * I18n :: Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import org.apache.maven.plugin.logging.SystemStreamLog; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.io.SortedProperties; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * To tes the {@link ParserStruts2Mojo.Struts2JspFileParser} parser. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5 + */ +public class Struts2JspFileParserTest { + + public static final String ENCODING = "utf-8"; + + protected static final SystemStreamLog log = new SystemStreamLog(); + + protected ParserStruts2Mojo.Struts2JspFileParser parser; + + protected SortedProperties oldParser; + + protected Set<String> detectedKeys; + + @Before + public void setUp() throws Exception { + oldParser = new SortedProperties(ENCODING); + + + parser = new ParserStruts2Mojo.Struts2JspFileParser( + log, + ENCODING, + oldParser, + Pattern.compile("^i18n\\..*$"), + false) { + @Override + protected void registerKey(String key) { + if (acceptKeyPattern != null) { + Matcher matcher = acceptKeyPattern.matcher(key); + if (!matcher.matches()) { + return; + } + } + detectedKeys.add(key); + } + }; + detectedKeys = new HashSet<String>(); + } + + @After + public void tearDown() throws Exception { + detectedKeys.clear(); + detectedKeys = null; + parser = null; + } + + @Test + public void getKeys() throws IOException { + + File file = new File("getKeys"); + String line; + + line = "label='%{getText(\"i18n.key1\")}'/>"; + parseLine(file, line, "i18n.key1"); + + line = "key=\"key22\" label='%{getText(\"i18n.key2\")}'/> "; + parseLine(file, line, "i18n.key2"); + } + + @Test + public void getKeys2() throws IOException { + + String line; + File file = new File("getKeys2"); + + line = "<s:text name=\"i18n.key3\"/>"; + parseLine(file, line, "i18n.key3"); + + line = "<s:text key='i18n.key4'/>"; + parseLine(file, line, "i18n.key4"); + } + + protected void parseLine(File f, String line, String... expectedKeys) throws IOException { + parser.parseLine(f, line); + for (String expectedKey : expectedKeys) { + + Assert.assertTrue("Key " + expectedKey + + " was expected from line " + line, + detectedKeys.contains(expectedKey)); + } + } +} Property changes on: trunk/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1970 - in trunk: i18n-maven-plugin/src/it/ano-1494/iso-8859-1 i18n-maven-plugin/src/it/ano-1494/migrate i18n-maven-plugin/src/it/ano-1494/utf-8 i18n-maven-plugin/src/it/ano-672 i18n-maven-plugin/src/it/evo-1507 i18n-maven-plugin/src/it/parsers/newProject i18n-maven-plugin/src/it/parsers/withNewKeys nuiton-i18n-editor/src/main/resources/i18n
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 21:38:13 +0200 (Wed, 29 Aug 2012) New Revision: 1970 Url: http://nuiton.org/repositories/revision/i18n/1970 Log: add missing svn properties Modified: trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/goals.txt trunk/i18n-maven-plugin/src/it/ano-1494/migrate/goals.txt trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/goals.txt trunk/i18n-maven-plugin/src/it/ano-672/goals.txt trunk/i18n-maven-plugin/src/it/evo-1507/goals.txt trunk/i18n-maven-plugin/src/it/parsers/newProject/goals.txt trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/goals.txt trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties Property changes on: trunk/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/ano-1494/migrate/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/ano-1494/utf-8/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/ano-672/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/evo-1507/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/parsers/newProject/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/resources/i18n/nuiton-i18n-editor_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1969 - trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 21:37:13 +0200 (Wed, 29 Aug 2012) New Revision: 1969 Url: http://nuiton.org/repositories/revision/i18n/1969 Log: fixes #2289: Deprecate some parser (jsp, tapestry) : there are not enough efficient :( Modified: 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 Modified: 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 2012-08-29 19:36:40 UTC (rev 1968) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2012-08-29 19:37:13 UTC (rev 1969) @@ -51,6 +51,7 @@ * * @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 { @@ -161,6 +162,7 @@ return new XmlFileParser(getLog(), encoding, oldParser, + acceptPattern, showTouchedFiles, rules, xpath, Modified: 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 2012-08-29 19:36:40 UTC (rev 1968) +++ trunk/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2012-08-29 19:37:13 UTC (rev 1969) @@ -46,6 +46,7 @@ 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 : @@ -57,6 +58,7 @@ * * @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 { @@ -73,7 +75,7 @@ /** * Default included files to process (ant-like expression). - * + * * Note: default value is **\/*.tml * * @since 2.1 @@ -146,11 +148,12 @@ } @Override - public FileParser newFileParser() { + public FileParser newFileParser(Pattern acceptPattern) { return new TapestryFileParser(getLog(), encoding, oldParser, + acceptPattern, isShowTouchedFiles() ); } @@ -161,8 +164,9 @@ public TapestryFileParser(Log log, String encoding, SortedProperties oldParser, + Pattern acceptKeyPattern, boolean showTouchedFiles) { - super(log, encoding, oldParser, showTouchedFiles); + super(log, encoding, oldParser, acceptKeyPattern, showTouchedFiles); } @@ -222,8 +226,8 @@ return; } - // one key found in file, so file is marked as touched - setTouched(true); +// // 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);

1 0