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

r1810 - in trunk/maven-i18n-plugin/src: it/parsers/withNewKeys it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test main/resources
by tchemit＠users.nuiton.org Nov. 18, 2010

Nov. 18, 2010

Author: tchemit Date: 2010-11-18 11:00:39 +0100 (Thu, 18 Nov 2010) New Revision: 1810 Url: http://nuiton.org/repositories/revision/i18n/1810 Log: Evolution #1056: Add validators/validator/message in validators ruleset Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/main/resources/validation.rules Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml 2010-11-18 10:00:39 UTC (rev 1810) @@ -25,24 +25,28 @@ --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="field1"> + <validator type="required"> + <message>validationGetter.key3</message> + </validator> + + <field name="field1"> - <field-validator type="required"> - <message>validationGetter.key1</message> - </field-validator> + <field-validator type="required"> + <message>validationGetter.key1</message> + </field-validator> - </field> + </field> - <field name="field2"> + <field name="field2"> - <field-validator type="required"> - <message>validationGetter.key2##${parm1}</message> - </field-validator> + <field-validator type="required"> + <message>validationGetter.key2##${parm1}</message> + </field-validator> - </field> + </field> </validators> Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-18 10:00:39 UTC (rev 1810) @@ -38,6 +38,7 @@ content = file.text; assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); +assert content.contains( 'validationGetter.key3=' ); file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); assert file.exists(); @@ -49,5 +50,6 @@ assert content.contains( 'javaGetter.key2=' ); assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); +assert content.contains( 'validationGetter.key3=' ); return true; Modified: trunk/maven-i18n-plugin/src/main/resources/validation.rules =================================================================== --- trunk/maven-i18n-plugin/src/main/resources/validation.rules 2010-11-18 10:00:28 UTC (rev 1809) +++ trunk/maven-i18n-plugin/src/main/resources/validation.rules 2010-11-18 10:00:39 UTC (rev 1810) @@ -1,3 +1,4 @@ # Règles pour la validation XWorks //validators/field/field-validator/message +//validators/validator/message

1 0

r1809 - trunk
by tchemit＠users.nuiton.org Nov. 18, 2010

Nov. 18, 2010

Author: tchemit Date: 2010-11-18 11:00:28 +0100 (Thu, 18 Nov 2010) New Revision: 1809 Url: http://nuiton.org/repositories/revision/i18n/1809 Log: Evolution #1057: Do not include in build the ant task Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-16 08:59:10 UTC (rev 1808) +++ trunk/pom.xml 2010-11-18 10:00:28 UTC (rev 1809) @@ -44,7 +44,7 @@ <modules> <module>nuiton-i18n</module> <module>maven-i18n-plugin</module> - <module>ant-i18n-task</module> +   </modules> @@ -282,4 +282,17 @@ </pluginManagement> </build> + + <profiles> +  + <profile> + <id>ant-task-profile</id> + + <modules> + <module>ant-i18n-task</module> + </modules> + </profile> + + + </profiles> </project>

1 0

r1808 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org Nov. 16, 2010

Nov. 16, 2010

Author: tchemit Date: 2010-11-16 09:59:10 +0100 (Tue, 16 Nov 2010) New Revision: 1808 Url: http://nuiton.org/repositories/revision/i18n/1808 Log: add verbose flag in XmlParser Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -287,6 +287,7 @@ private final Map<String, String> namespaces2; + private final boolean verbose; /** * Fonction d'extraction de la chaine * @@ -301,11 +302,14 @@ boolean showTouchedFiles, String rules, XPath xpath, - DocumentBuilder builder, Map<String, String> namespaces) { + DocumentBuilder builder, + Map<String, String> namespaces, + boolean verbose) { super(log, encoding, oldParser, showTouchedFiles); this.xpath = xpath; this.rules = rules; this.builder = builder; + this.verbose = verbose; if (namespaces != null && !namespaces.isEmpty()) { this.namespaces = namespaces; @@ -356,12 +360,15 @@ try { // Recherche des clés à partir d'un xpath + if (verbose) { + getLog().info("Start parsing file " + fileToProcess); + } Document doc = builder.parse(fileToProcess.getAbsolutePath()); XPathExpression expression = xpath.compile(rules); NodeList list = (NodeList) expression.evaluate(doc, XPathConstants.NODESET); - if (getLog().isDebugEnabled()) { - getLog().debug("Detected nodes [" + file + "] : " + list.getLength()); + if (verbose) { + getLog().info("Detected nodes [" + file + "] : " + list.getLength()); } for (int index = 0; index < list.getLength(); index++) { Node node = list.item(index); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -152,7 +152,9 @@ showTouchedFiles, rules, xpath, - builder, namespaces) { + builder, + namespaces, + isVerbose()) { @Override public File prepareFile(File file) throws IOException { Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-11-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -149,7 +149,9 @@ showTouchedFiles, rules, xpath, - builder, namespaces) { + builder, + namespaces, + isVerbose()) { @Override public String extract(String i18nString) { String s = null; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2010-11-12 11:48:31 UTC (rev 1807) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2010-11-16 08:59:10 UTC (rev 1808) @@ -111,7 +111,9 @@ showTouchedFiles, rules, xpath, - builder, namespaces) { + builder, + namespaces, + isVerbose()) { @Override public String extract(String i18nString) { String s = null;

1 0

r1807 - in trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin: bundle parser/impl
by tchemit＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: tchemit Date: 2010-11-12 12:48:31 +0100 (Fri, 12 Nov 2010) New Revision: 1807 Url: http://nuiton.org/repositories/revision/i18n/1807 Log: add headers + keywords Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java 2010-11-12 11:41:48 UTC (rev 1806) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java 2010-11-12 11:48:31 UTC (rev 1807) @@ -1,3 +1,27 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.i18n.plugin.parser.impl; import org.nuiton.processor.Processor; Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:41:48 UTC (rev 1806) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:48:31 UTC (rev 1807) @@ -2,8 +2,8 @@ * #%L * I18n :: Maven Plugin * - * $Id: ParserValidationMojo.java 1800 2010-11-11 13:02:21Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/main/java/org/nu… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2007 - 2010 CodeLutin * %% Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1806 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: tchemit Date: 2010-11-12 12:41:48 +0100 (Fri, 12 Nov 2010) New Revision: 1806 Url: http://nuiton.org/repositories/revision/i18n/1806 Log: Evolution #1041: Introduce ParserJspMojo Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/JspFileProcessor.java 2010-11-12 11:41:48 UTC (rev 1806) @@ -0,0 +1,143 @@ +package org.nuiton.i18n.plugin.parser.impl; + +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 transform jsp files to valid xml files. + * + * 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 class JspFileProcessor extends Processor { + + public JspFileProcessor() { + setInputFilter( + new Filter[]{ + new JspDirectiveFilter(), + new JspCommentFilter(), + 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 + */ + 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; + } + } + + /** + * To remove jsp comment from files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ + public static class JspCommentFilter 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; + } + } + + /** + * To remove jsp directive from files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ + public static class JspDirectiveFilter 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; + } + } +} Added: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2010-11-12 11:41:48 UTC (rev 1806) @@ -0,0 +1,196 @@ +/* + * #%L + * I18n :: Maven Plugin + * + * $Id: ParserValidationMojo.java 1800 2010-11-11 13:02:21Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/maven-i18n-plugin/src/main/java/org/nu… $ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.i18n.plugin.parser.impl; + +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 javax.xml.parsers.DocumentBuilder; +import javax.xml.xpath.XPath; +import java.io.File; +import java.io.IOException; + +/** + * Find i18n keys from jsp files. + * + * Note: 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> + * @goal parserJsp + * @phase generate-resources + * @since 2.0 + */ +public class ParserJspMojo extends AbstractParserXmlMojo { + + /** + * Root directory of the default entry. + * + * @parameter expression="${i18n.defaultBasedir}" default-value="${basedir}/src/main/webapp" + * @required + */ + protected File defaultBasedir; + + /** + * Default included files to process (ant-like expression). + * + * @parameter expression="${i18n.defaultIncludes}" default-value="**\/**.jsp" + */ + protected String defaultIncludes; + + /** + * Defines the core rules file used to detect i18n keys in jsp files. + * + * Note : If you do not want to use it, set it to empty and fill the + * {@link #userRulesFiles} parameter. + * + * @parameter expression="${i18n.coreRuleFile}" + * @since 2.0 + */ + protected String coreRuleFile; + + /** + * Defines the file name of the getter where to put detected i18n keys + * while getter phase. + * + * @parameter expression="${i18n.outputGetter}" default-value="jsp.getter" + * @since 2.0 + */ + protected String outputGetter; + + /** + * Where to generated temporary processed files. + * + * @parameter expression="${i18n.workdir}" default-value="${basedir}/target/i18n-workdir" + * @since 2.0 + */ + 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(), + getEncoding(), + oldParser, + showTouchedFiles, + rules, + xpath, + builder, namespaces) { + + @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()); + return result; + } + + @Override + public String extract(String i18nString) { + String s = null; + if (!i18nString.trim().isEmpty()) { + s = i18nString.trim(); + } + if (getLog().isDebugEnabled()) { + getLog().debug(i18nString + " = " + s); + } + return s; + } + + }; + } + + + @Override + @Deprecated + protected String getKeyModifierStart() { + return "=\\s*[\"\']"; + } + + @Override + @Deprecated + protected String getKeyModifierEnd() { + return "[\"\']"; + } +}

1 0

r1805 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: tchemit Date: 2010-11-12 12:41:34 +0100 (Fri, 12 Nov 2010) New Revision: 1805 Url: http://nuiton.org/repositories/revision/i18n/1805 Log: introduce prepareFile method to be able to do things before scanning it Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-12 11:41:16 UTC (rev 1804) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-12 11:41:34 UTC (rev 1805) @@ -316,7 +316,6 @@ NamespaceContext ctx = new NamespaceContext() { public String getNamespaceURI(String prefix) { return XmlFileParser.this.namespaces.get(prefix); -// return getNamespaceForPrefix(prefix, doc); } @Override @@ -336,21 +335,38 @@ } } + /** + * To prepare the file (if any thing to be done before scanning it). + * + * @param file the incoming file + * @return the real file to process + * @throws IOException if any IO problem while preparing file + * @since 2.0 + */ + public File prepareFile(File file) throws IOException { + + // by default, do nothing + return file; + } + @Override public void parseFile(File file) throws IOException { + File fileToProcess = prepareFile(file); try { // Recherche des clés à partir d'un xpath - Document doc = builder.parse(file.getAbsolutePath()); + Document doc = builder.parse(fileToProcess.getAbsolutePath()); XPathExpression expression = xpath.compile(rules); NodeList list = (NodeList) expression.evaluate(doc, XPathConstants.NODESET); - getLog().info("Detected nodes [" + file + "] : " + list.getLength()); + if (getLog().isDebugEnabled()) { + getLog().debug("Detected nodes [" + file + "] : " + list.getLength()); + } for (int index = 0; index < list.getLength(); index++) { Node node = list.item(index); - parseLine(file, node.getTextContent()); + parseLine(fileToProcess, node.getTextContent()); } } catch (Exception e) { throw new ParserException(e);

1 0

r1804 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser
by tchemit＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: tchemit Date: 2010-11-12 12:41:16 +0100 (Fri, 12 Nov 2010) New Revision: 1804 Url: http://nuiton.org/repositories/revision/i18n/1804 Log: introduce prepareFile method to be able to do things before scanning it Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-11-11 16:48:13 UTC (rev 1803) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-11-12 11:41:16 UTC (rev 1804) @@ -87,7 +87,7 @@ * @parameter expression="${i18n.cp}" default-value="${basedir}/target/classes" */ protected File cp; - + /** * To activate the modification of keys * @@ -202,6 +202,11 @@ parserExecutor = new ParserExecutor(this); } + protected boolean onEnterEntry(I18nSourceEntry entry) { + boolean skip = entry.init(this); + return skip; + } + @Override protected void doAction() throws Exception { if (keysModifier) { @@ -241,7 +246,7 @@ for (I18nSourceEntry entry : entries) { - boolean skip = entry.init(this); + boolean skip = onEnterEntry(entry); if (skip) { if (!silent && verbose) {

1 0

r1803 - trunk
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 17:48:13 +0100 (Thu, 11 Nov 2010) New Revision: 1803 Url: http://nuiton.org/repositories/revision/i18n/1803 Log: use m-helper-plugin stable version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 14:55:02 UTC (rev 1802) +++ trunk/pom.xml 2010-11-11 16:48:13 UTC (rev 1803) @@ -241,7 +241,7 @@ <projectId>i18n</projectId>  - <helperPluginVersion>1.2.9-SNAPSHOT</helperPluginVersion> + <helperPluginVersion>1.2.9</helperPluginVersion> <processorVersion>1.0.4-SNAPSHOT</processorVersion>

1 0

r1802 - trunk
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 15:55:02 +0100 (Thu, 11 Nov 2010) New Revision: 1802 Url: http://nuiton.org/repositories/revision/i18n/1802 Log: do NOT use mavenpom dependencies since it does not work on windows os Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 14:44:54 UTC (rev 1801) +++ trunk/pom.xml 2010-11-11 14:55:02 UTC (rev 1802) @@ -58,6 +58,12 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + </dependency> + + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.8.2</version> @@ -199,10 +205,11 @@ <scope>compile</scope> </dependency> -  + <version>1.2.16</version> + </dependency> <dependency> <groupId>org.apache.ant</groupId>

1 0

r1801 - in trunk: . ant-i18n-task/src/license
by tchemit＠users.nuiton.org Nov. 11, 2010

Nov. 11, 2010

Author: tchemit Date: 2010-11-11 15:44:54 +0100 (Thu, 11 Nov 2010) New Revision: 1801 Url: http://nuiton.org/repositories/revision/i18n/1801 Log: do NOT use mavenpom dependencies since it does not work on windows os + update ant to 1.8.0 Modified: trunk/ant-i18n-task/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/ant-i18n-task/src/license/THIRD-PARTY.properties =================================================================== --- trunk/ant-i18n-task/src/license/THIRD-PARTY.properties 2010-11-11 13:02:21 UTC (rev 1800) +++ trunk/ant-i18n-task/src/license/THIRD-PARTY.properties 2010-11-11 14:44:54 UTC (rev 1801) @@ -1,38 +1,14 @@ -### -# #%L -# I18n :: Ant task -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License # - Common Public License Version 1.0 -# - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Jun 27 08:59:58 CEST 2010 -org.apache.ant--ant--1.7.1=The Apache Software License, Version 2.0 -org.apache.ant--ant-launcher--1.7.1=The Apache Software License, Version 2.0 +#Thu Nov 11 15:08:04 CET 2010 +org.apache.ant--ant--1.8.0==The Apache Software License, Version 2.0 +org.apache.ant--ant-launcher--1.8.0=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-11 13:02:21 UTC (rev 1800) +++ trunk/pom.xml 2010-11-11 14:44:54 UTC (rev 1801) @@ -51,20 +51,23 @@ <dependencyManagement> <dependencies> -  + <version>1.4</version> + </dependency> <dependency> <groupId>org.nuiton.processor</groupId> @@ -159,11 +162,12 @@  -  + </dependency>  <dependency> @@ -203,7 +207,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.7.1</version> + <version>1.8.0</version> <scope>compile</scope> </dependency> @@ -230,9 +234,11 @@ <projectId>i18n</projectId>  - <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion> + <helperPluginVersion>1.2.9-SNAPSHOT</helperPluginVersion> <processorVersion>1.0.4-SNAPSHOT</processorVersion> + + <mavenVersion>2.2.1</mavenVersion>  <locales>fr,en</locales>

1 0