Author: tchemit Date: 2011-01-04 09:15:32 +0100 (Tue, 04 Jan 2011) New Revision: 1836 Url: http://nuiton.org/repositories/revision/i18n/1836 Log: Evolution #1195: Clean site documentation Evolution #1193: Introduce Tapestry Parser to grab i18n keys from tml files Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/MyTml.tml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/MyTml.tml trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/TapestryFileProcessor.java Modified: trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java trunk/maven-i18n-plugin/src/site/apt/index.apt trunk/maven-i18n-plugin/src/site/en/apt/index.apt trunk/maven-i18n-plugin/src/site/site_en.xml trunk/maven-i18n-plugin/src/site/site_fr.xml Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/pom.xml 2011-01-04 08:15:32 UTC (rev 1836) @@ -67,12 +67,12 @@ <artifactId>commons-lang</artifactId> </dependency> - <!--dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </dependency--> - <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> </dependency> @@ -159,6 +159,10 @@ <version>2.5.1</version> </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <version>1.5</version> + </plugin> </plugins> </reporting> Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2011-01-04 08:15:32 UTC (rev 1836) @@ -72,7 +72,8 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> - </goals> + <goal>parserTapestry</goal> + </goals> </execution> <execution> <id>jsp</id> @@ -95,6 +96,7 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> + <goal>parserTapestry</goal> </goals> <phase>compile</phase> </execution> Added: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/MyTml.tml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/MyTml.tml (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/MyTml.tml 2011-01-04 08:15:32 UTC (rev 1836) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%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% + --> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<div> + <label>${message:tmlGetter.key1} : </label> + <label>${format:tmlGetter.key2=miamiam} : </label> +</div> \ No newline at end of file Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/MyTml.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy 2011-01-04 08:15:32 UTC (rev 1836) @@ -44,4 +44,11 @@ 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=' ); + return true; Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2011-01-04 08:15:32 UTC (rev 1836) @@ -83,6 +83,7 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> + <goal>parserTapestry</goal> </goals> </execution> <execution> @@ -112,6 +113,7 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> + <goal>parserTapestry</goal> <goal>gen</goal> </goals> <phase>compile</phase> Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties 2011-01-04 08:15:32 UTC (rev 1836) @@ -1,3 +1,4 @@ javaGetter.old.key1=hum1 javaGetter.old.key2=hum2 jspGetter.key1=humJsp1 +tmlGetter.key1=humTapestry1 Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/MyTml.tml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/MyTml.tml (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/MyTml.tml 2011-01-04 08:15:32 UTC (rev 1836) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%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% + --> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<div> + <label>${message:tmlGetter.key1} : </label> + <label>${format:tmlGetter.key2=miamiam} : </label> +</div> \ No newline at end of file Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/MyTml.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2011-01-04 08:15:32 UTC (rev 1836) @@ -47,6 +47,14 @@ 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, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); assert file.exists(); @@ -61,4 +69,7 @@ assert content.contains( 'jspGetter.key1=' ); assert content.contains( 'jspGetter.key2=' ); +assert content.contains( 'tmlGetter.key1=' ); +assert content.contains( 'tmlGetter.key2=' ); + return true; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2011-01-04 08:15:32 UTC (rev 1836) @@ -137,7 +137,7 @@ * @param file the incoming file * @return the real file to process * @throws IOException if any IO problem while preparing file - * @since 2.0.2 + * @since 2.1 */ protected File prepareFile(File file) throws IOException { return file; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java 2011-01-04 08:15:32 UTC (rev 1836) @@ -1,6 +1,29 @@ +/* + * #%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.commons.logging.LogFactory; import org.apache.maven.plugin.logging.Log; import org.nuiton.i18n.plugin.parser.AbstractFileParser; import org.nuiton.i18n.plugin.parser.AbstractI18nParserMojo; @@ -11,10 +34,6 @@ import org.nuiton.io.FileUpdater; import org.nuiton.io.MirroredFileUpdater; import org.nuiton.io.SortedProperties; -import org.nuiton.processor.Processor; -import org.nuiton.processor.ProcessorUtil; -import org.nuiton.processor.filters.DefaultFilter; -import org.nuiton.processor.filters.Filter; import java.io.File; import java.io.FileInputStream; @@ -23,7 +42,9 @@ import java.io.LineNumberReader; /** - * To parse Tapestry templates to detect new I18n keys. + * To parse Tapestry templates to detect new I18n keys, says content of patterns : + * {@code ${message:XXX}} and {@code ${format:XXX=...}}. + * * <p/> * <b>Note: </b> this goal must always be invoked before the {@code process-resources} * phase, otherwise all files will be considered as uptodate. @@ -31,7 +52,7 @@ * @author tchemit <chemit@codelutin.com> * @goal parserTapestry * @phase generate-resources - * @since 2.0.2 + * @since 2.1 */ public class ParserTapestryMojo extends AbstractI18nParserMojo { @@ -160,6 +181,7 @@ // don't care about it... } TapestryFileProcessor processor = new TapestryFileProcessor(); + processor.setVerbose(isVerbose()); processor.process(file, result, getEncoding()); return result; } @@ -211,133 +233,4 @@ } } - /** - * To Extract from tapestry template files, i18n keys. - * <p/> - * Says : - * <ul> - * <li>Keep content of {@code ${message:XXX}</li> - * <li>Keep content of {@code ${format:XXX}</li> - * </ul> - * - * @author tchemit <chemit@codelutin.com> - * @since 2.0.2 - */ - public static class TapestryFileProcessor extends Processor { - - public TapestryFileProcessor() { - setInputFilter(new Filter[]{ - new RemoveCommentFilter(), - new ExtractMessageFilter() - }); - } - - public void process(File filein, - File fileout, - String encoding) throws IOException { - ProcessorUtil.doProcess(this, filein, fileout, encoding); - } - - /** - * To remove comments from tapestry template files. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.0.2 - */ - public static class RemoveCommentFilter extends DefaultFilter { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static org.apache.commons.logging.Log log = LogFactory.getLog(ExtractMessageFilter.class); - - private String header = "<" + "!" + "-" + "-"; - - private String footer = "-" + "-" + ">"; - - @Override - protected String performInFilter(String ch) { - return EMPTY_STRING; - } - - @Override - protected String performOutFilter(String ch) { - return ch; - } - - protected String getHeader() { - return header; - } - - protected String getFooter() { - return footer; - } - } - - /** - * To obtain inside of {@code ${message:XXX}} from tapestry template files. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.0.2 - */ - public static class ExtractMessageFilter extends DefaultFilter { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static org.apache.commons.logging.Log log = LogFactory.getLog(ExtractMessageFilter.class); - - private String header = "$" + "{" + "m" + "e" + "s" + "s" + "a" + "g" + "e" + ":"; - - private String footer = "}"; - - @Override - protected String performInFilter(String ch) { - if (log.isDebugEnabled()) { - log.debug("Detected key " + ch); - } - return ch + "\n"; - } - - @Override - protected String performOutFilter(String ch) { - return EMPTY_STRING; - } - - protected String getHeader() { - return header; - } - - protected String getFooter() { - return footer; - } - } - - /** - * To obtain inside of {@code ${format:XXX}} from tapestry template files. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.0.2 - */ - public static class ExtractFormatFilter extends DefaultFilter { - - private String header = "$" + "{" + "f" + "o" + "r" + "m" + "a" + "t" + ":"; - - private String footer = "}"; - - @Override - protected String performInFilter(String ch) { - return ch + "\n"; - } - - @Override - protected String performOutFilter(String ch) { - return ""; - } - - protected String getHeader() { - return header; - } - - protected String getFooter() { - return footer; - } - } - } } Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserTapestryMojo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/TapestryFileProcessor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/TapestryFileProcessor.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/TapestryFileProcessor.java 2011-01-04 08:15:32 UTC (rev 1836) @@ -0,0 +1,192 @@ +/* + * #%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.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.processor.Processor; +import org.nuiton.processor.ProcessorUtil; +import org.nuiton.processor.filters.DefaultFilter; +import org.nuiton.processor.filters.Filter; + +import java.io.File; +import java.io.IOException; + +/** + * 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@codelutin.com> + * @since 2.1 + */ +public class TapestryFileProcessor extends Processor { + + /** Logger. */ + static private final Log log = + LogFactory.getLog(TapestryFileProcessor.class); + + protected boolean verbose; + + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + public void process(File filein, + File fileout, + String encoding) throws IOException { + File fileTemp1 = new File(fileout.getAbsolutePath() + "~-message"); + setInputFilter(new Filter[]{ + new RemoveCommentFilter(), + new ExtractMessageFilter() + }); + ProcessorUtil.doProcess(this, filein, fileTemp1, encoding); + + File fileTemp2 = new File(fileout.getAbsolutePath() + "~-format"); + + setInputFilter(new Filter[]{ + new RemoveCommentFilter(), + new ExtractFormatFilter() + }); + ProcessorUtil.doProcess(this, filein, fileTemp2, encoding); + + String tmp1 = FileUtils.readFileToString(fileTemp1).trim(); + String tmp2 = FileUtils.readFileToString(fileTemp2).trim(); + if (log.isDebugEnabled()) { + log.debug("Keys from message:\n" + tmp1); + log.debug("Keys from format:\n" + tmp2); + } + FileUtils.writeStringToFile(fileout, tmp1 + "\n" + tmp2); + } + + /** + * To remove comments from tapestry template files. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.1 + */ + public class RemoveCommentFilter extends DefaultFilter { + + private String header = "<" + "!" + "-" + "-"; + + private String footer = "-" + "-" + ">"; + + @Override + protected String performInFilter(String ch) { + return EMPTY_STRING; + } + + @Override + protected String performOutFilter(String ch) { + return ch; + } + + protected String getHeader() { + return header; + } + + protected String getFooter() { + return footer; + } + } + + /** + * To obtain inside of {@code ${message:XXX}} from tapestry template files. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.1 + */ + public class ExtractMessageFilter extends DefaultFilter { + + private String header = "$" + "{" + "m" + "e" + "s" + "s" + "a" + "g" + "e" + ":"; + + private String footer = "}"; + + @Override + protected String performInFilter(String ch) { + if (verbose) { + log.info("Detected key " + ch); + } + return ch + "\n"; + } + + @Override + protected String performOutFilter(String ch) { + return EMPTY_STRING; + } + + protected String getHeader() { + return header; + } + + protected String getFooter() { + return footer; + } + } + + /** + * To obtain {@code XXX} data {@code ${format:XXX=YYY}} from tapestry template files. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.1 + */ + public class ExtractFormatFilter extends DefaultFilter { + + private String header = "$" + "{" + "f" + "o" + "r" + "m" + "a" + "t" + ":"; + + private String footer = "}"; + + @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"; + } + + @Override + protected String performOutFilter(String ch) { + return EMPTY_STRING; + } + + protected String getHeader() { + return header; + } + + protected String getFooter() { + return footer; + } + } +} Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/TapestryFileProcessor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/maven-i18n-plugin/src/site/apt/index.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/apt/index.apt 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/site/apt/index.apt 2011-01-04 08:15:32 UTC (rev 1836) @@ -42,9 +42,9 @@ * {{{./parserValidation-mojo.html} i18n:parserValidation}} parse XWorks validation sources. - * {{{./parserJavaActionConfig-mojo.html} i18n:parserJavaActionConfig}} parse actions jaxx. + * {{{./parserJsp-mojo.html} i18n:parserJsp}} parse JSP sources. - * {{{./parserJavaTabConfig-mojo.html} i18n:parserJavaTabConfig}} parse tabs jaxx. + * {{{./parserTapestry-mojo.html} i18n:parserTapestry}} parse Tapestry templates sources. * {{{./get-mojo.html} i18n:get}} assembly getter computed by parser-like goals. Modified: trunk/maven-i18n-plugin/src/site/en/apt/index.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/en/apt/index.apt 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/site/en/apt/index.apt 2011-01-04 08:15:32 UTC (rev 1836) @@ -42,9 +42,9 @@ * {{{./parserValidation-mojo.html} i18n:parserValidation}} parse XWorks validation sources. - * {{{./parserJavaActionConfig-mojo.html} i18n:parserJavaActionConfig}} parse actions jaxx. + * {{{./parserJsp-mojo.html} i18n:parserJsp}} parse jsp sources. - * {{{./parserJavaTabConfig-mojo.html} i18n:parserJavaTabConfig}} parse tabs jaxx. + * {{{./parserTapestry-mojo.html} i18n:parserTapestry}} parse Tapestry template sources. * {{{./get-mojo.html} i18n:get}} assembly getter computed by parser-like goals. Modified: trunk/maven-i18n-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-i18n-plugin/src/site/site_en.xml 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/site/site_en.xml 2011-01-04 08:15:32 UTC (rev 1836) @@ -51,11 +51,9 @@ <item name="Usages" href="usages.html"/> <item name="Parser Goals" href="plugin-info.html"> <item name="parserJava" href="parserJava-mojo.html"/> - <item name="parserJaxx" href="parserJaxx-mojo.html"/> - <item name="parserSwixat" href="parserSwixat-mojo.html"/> - <item name="parserJavaActionConfig" - href="parserJavaActionConfig-mojo.html"/> - <item name="parserJavaTabConfig" href="parserJavaTabConfig-mojo.html"/> + <item name="parserXml" href="parserXml-mojo.html"/> + <item name="parserJsp" href="parserJsp-mojo.html"/> + <item name="parserTapestry" href="parserTapestry-mojo.html"/> <item name="parserValidation" href="parserValidation-mojo.html"/> <item name="get" href="get-mojo.html"/> <item name="gen" href="gen-mojo.html"/> Modified: trunk/maven-i18n-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-i18n-plugin/src/site/site_fr.xml 2011-01-03 20:13:39 UTC (rev 1835) +++ trunk/maven-i18n-plugin/src/site/site_fr.xml 2011-01-04 08:15:32 UTC (rev 1836) @@ -49,11 +49,9 @@ <item name="Usages" href="usages.html"/> <item name="Parser Goals" href="plugin-info.html"> <item name="parserJava" href="parserJava-mojo.html"/> - <item name="parserJaxx" href="parserJaxx-mojo.html"/> - <item name="parserSwixat" href="parserSwixat-mojo.html"/> - <item name="parserJavaActionConfig" - href="parserJavaActionConfig-mojo.html"/> - <item name="parserJavaTabConfig" href="parserJavaTabConfig-mojo.html"/> + <item name="parserXml" href="parserXml-mojo.html"/> + <item name="parserJsp" href="parserJsp-mojo.html"/> + <item name="parserTapestry" href="parserTapestry-mojo.html"/> <item name="parserValidation" href="parserValidation-mojo.html"/> <item name="get" href="get-mojo.html"/> <item name="gen" href="gen-mojo.html"/>