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

r1797 - in trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin: . bundle
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 12:16:40 +0100 (Thu, 11 Nov 2010) New Revision: 1797 Url: http://nuiton.org/repositories/revision/i18n/1797 Log: Evolution #754: Add a flag failsIfWarning on bundle mojos Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-11-11 11:00:37 UTC (rev 1796) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-11-11 11:16:40 UTC (rev 1797) @@ -223,11 +223,14 @@ return file; } - protected void checkBundle(Locale locale, Properties propertiesOut, + protected boolean checkBundle(Locale locale, Properties propertiesOut, boolean showEmpty) { + + boolean safe = true; // on verifie qu'il n'y a pas de traduction vide SortedSet<String> emptyEntries = PluginHelper.getEmptyKeys(propertiesOut); if (!emptyEntries.isEmpty()) { + safe=false; StringBuilder buffer = new StringBuilder(); int size = emptyEntries.size(); buffer.append("bundle "); @@ -258,6 +261,7 @@ " entries)."); } } + return safe; } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-11-11 11:00:37 UTC (rev 1796) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-11-11 11:16:40 UTC (rev 1797) @@ -25,6 +25,7 @@ package org.nuiton.i18n.plugin.bundle; +import org.apache.maven.plugin.MojoFailureException; import org.nuiton.i18n.bundle.I18nBundleEntry; import org.nuiton.i18n.bundle.I18nBundleUtil; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -133,6 +134,18 @@ */ protected boolean generateDefinitionFile; + /** + * A flag to make the build fails if there is some warnings while generating + * bundle, says when it misses some translations. + * + * Note : This parameter should be used in a release profile to + * ensure bundles are complete. + * + * @parameter expression="${i18n.failsIfWarning}" default-value="false" + * @since 2.0 + */ + protected boolean failsIfWarning; + @Override public void init() throws Exception { super.init(); @@ -167,6 +180,7 @@ Map<Locale, String> bundleDico = new LinkedHashMap<Locale, String>(locales.length); + List<Locale> unsafeLocales = new ArrayList<Locale>(); for (Locale locale : locales) { long t0 = System.nanoTime(); @@ -227,13 +241,23 @@ PluginHelper.convertTime(t0, System.nanoTime()) + " (detected sentences : " + propertiesOut.size() + ")"); } - if (checkBundle) { - checkBundle(locale, propertiesOut, showEmpty); + if (checkBundle || failsIfWarning) { + boolean localSafe = + checkBundle(locale, propertiesOut, showEmpty); + if (!localSafe) { + unsafeLocales.add(locale); + } } } + if (failsIfWarning && !unsafeLocales.isEmpty()) { + + // there is at least one not complete bundle, faisl the build + throw new MojoFailureException("Bundles for locale(s) " + unsafeLocales + " are not complete"); + } + if (generateDefinitionFile) { - + // ecriture du ficher des definitions i18n (permet de faire une // recherche exacte sur un fichier puis d'en deduire les bundles a // charger

1 0

r1796 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 12:00:37 +0100 (Thu, 11 Nov 2010) New Revision: 1796 Url: http://nuiton.org/repositories/revision/i18n/1796 Log: add header Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1795 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 11:52:30 +0100 (Thu, 11 Nov 2010) New Revision: 1795 Url: http://nuiton.org/repositories/revision/i18n/1795 Log: Evolution #1026: Introduce parserXml mojo Evolution #1027: Refactor ParserXml*** Evolution #1028: Deprecates parserJavaActionConfig and parserJavaTabConfig mojo Added: 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/ParserXmlUserMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.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/ParserXmlMojo.java Copied: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java (from rev 1789, trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java) =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2010-11-11 10:52:30 UTC (rev 1795) @@ -0,0 +1,370 @@ +/* + * #%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.apache.commons.lang.StringUtils; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.logging.Log; +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.ParserException; +import org.nuiton.io.SortedProperties; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import javax.xml.namespace.NamespaceContext; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpression; +import javax.xml.xpath.XPathFactory; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +/** + * Abstract xml parser mojo. + * + * @author tchemit <chemit(a)codelutin.com> + * @author jruchaud <ruchaud(a)codelutin.com> + * @since 2.0 + */ +public abstract class AbstractParserXmlMojo extends AbstractI18nParserMojo { + + /** Taille du buffer pour les lectures/écritures */ + protected static final int BUFFER_SIZE = 8 * 1024; + + /** available rules to detect i18n keys in xml files. */ + protected String rules; + + /** XPath factory used to detect i18n keys in xml files. */ + protected XPathFactory factory; + + /** Document builder factory to load xml files. */ + protected DocumentBuilderFactory documentBuilderFactory; + + /** + * Extra rules files to use for detecting i18n keys in xml validation files. + * + * Note : If the {@code coreRulesFile} is not defined, then you must + * fill this parameter. + * + * @parameter + * @since 2.0 + */ + protected String[] userRulesFiles; + + /** + * Defines namespaces mapping if needed. + * + * Example : + * <pre> + * <namespaces> + * <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + * </namespaces> + * </pre> + * + * @parameter + * @since 2.0 + */ + protected Map<String, String> namespaces; + + protected abstract String getCoreRuleFile(); + + protected abstract XmlFileParser newXmlFileParser(XPath xpath, + DocumentBuilder builder); + + /** + * Obtain the list of files which define rules to apply. + * + * @return the list of path to rule files to used. + */ + protected List<String> getRulefiles() { + List<String> result = new ArrayList<String>(); + + // load optional core rule file + String s = getCoreRuleFile(); + if (!StringUtils.isEmpty(s)) { + result.add(s); + } + + // load user rile files + String[] userFiles = getUserRuleFiles(); + if (userFiles != null) { + for (String f : userFiles) { + if (!StringUtils.isEmpty(f)) { + result.add(f); + } + } + } + return result; + } + + @Override + public void init() throws Exception { + super.init(); + factory = XPathFactory.newInstance(); + + List<String> files = getRulefiles(); + + if (files.isEmpty()) { + + // no rules file defined + throw new MojoFailureException("No rules files defined, fill the coreRulesFile or userRulesFiles parameters"); + } + + rules = loadRules(files); + + documentBuilderFactory = DocumentBuilderFactory.newInstance(); + documentBuilderFactory.setNamespaceAware(true); + documentBuilderFactory.setValidating(false); + documentBuilderFactory.setCoalescing(false); + documentBuilderFactory.setIgnoringComments(true); + } + + public final String[] getUserRuleFiles() { + return userRulesFiles; + } + + @Override + public final FileParser newFileParser() { + + DocumentBuilder builder; + try { + // never forget this! + builder = documentBuilderFactory.newDocumentBuilder(); + + } catch (ParserConfigurationException ex) { + throw new IllegalStateException( + "could not load DocumentBuilder for reason " + + ex.getMessage(), ex); + } + XPath xpath = factory.newXPath(); + + return newXmlFileParser(xpath, builder); + } + + protected String loadRules(List<String> files) { + + List<String> rules = new ArrayList<String>(); + + boolean verbose = !isSilent() && isVerbose(); + + for (String file : files) { + + getLog().info("Load rules file " + file); + + try { + String fileRules = loadRulesFile(file); + rules.add(fileRules); + + if (verbose) { + getLog().info("Rules for file [" + file + "] : " + fileRules); + } + + } catch (IOException e) { + throw new ParserException(e); + } + } + + String result = StringUtils.join(rules, " | "); + if (verbose) { + getLog().info("Loaded rules : " + result); + } + return result; + } + + protected String loadRulesFile(String fileRules) throws IOException { + File f = new File(fileRules); + + InputStream inputStream; + if (f.exists()) { + + // load from a file + try { + inputStream = new FileInputStream(f); + } catch (FileNotFoundException e) { + throw new ParserException(e); + } + } else { + + // load from classpath + ClassLoader classLoader = getClass().getClassLoader(); + inputStream = classLoader.getResourceAsStream(fileRules); + } + if (inputStream == null) { + throw new ParserException( + "could not found file of rules : " + fileRules); + } + + inputStream = new BufferedInputStream(inputStream); + + try { + // Lecture + String readInputStream; + readInputStream = readInputStream(inputStream); + return readInputStream; + } catch (IOException e) { + throw new ParserException(e); + } finally { + inputStream.close(); + } + } + + /** + * Permet la lecture d'un InputStream et Suppressions. + * + * @param in le flux entrant + * @return le contenu du flux + * @throws IOException si problème de lecture dans flux entrant + */ + private String readInputStream(InputStream in) throws IOException { + StringBuilder sb = new StringBuilder(); + byte[] buffer = new byte[BUFFER_SIZE]; + while (in.read(buffer, 0, BUFFER_SIZE) != -1) { + String tmp = new String(buffer); + sb.append(tmp); + } + in.close(); + // Suppression + String txt = sb.toString().trim(); + + // suppression des commentaires + txt = txt.replaceAll("#.*\n", ""); + + // contruction du xpath avec des ou + txt = txt.replaceAll("\\s+", " | "); + + // suppression des ou de début et de fin + txt = txt.replaceAll("(^ \\| )|( \\| $)", ""); + return txt; + } + + public static abstract class XmlFileParser extends AbstractFileParser { + + private final XPath xpath; + + private final String rules; + + private final DocumentBuilder builder; + + private final Map<String, String> namespaces; + + private final Map<String, String> namespaces2; + + /** + * Fonction d'extraction de la chaine + * + * @param i18nString le clef i18n + * @return la chaine + */ + public abstract String extract(String i18nString); + + public XmlFileParser(Log log, + String encoding, + SortedProperties oldParser, + boolean showTouchedFiles, + String rules, + XPath xpath, + DocumentBuilder builder, Map<String, String> namespaces) { + super(log, encoding, oldParser, showTouchedFiles); + this.xpath = xpath; + this.rules = rules; + this.builder = builder; + + if (namespaces != null && !namespaces.isEmpty()) { + this.namespaces = namespaces; + namespaces2 = new TreeMap<String, String>(); + for (Map.Entry<String, String> e : namespaces.entrySet()) { + namespaces2.put(e.getValue(), e.getKey()); + } + NamespaceContext ctx = new NamespaceContext() { + public String getNamespaceURI(String prefix) { + return XmlFileParser.this.namespaces.get(prefix); +// return getNamespaceForPrefix(prefix, doc); + } + + @Override + public String getPrefix(String namespaceURI) { + return namespaces2.get(namespaceURI); + } + + @Override + public Iterator<?> getPrefixes(String namespaceURI) { + return null; + } + }; + xpath.setNamespaceContext(ctx); + } else { + namespaces2 = null; + this.namespaces = null; + } + } + + @Override + public void parseFile(File file) throws IOException { + + try { + + // Recherche des clés à partir d'un xpath + Document doc = builder.parse(file.getAbsolutePath()); + XPathExpression expression = xpath.compile(rules); + NodeList list = (NodeList) + expression.evaluate(doc, XPathConstants.NODESET); + getLog().info("Detected nodes [" + file + "] : " + list.getLength()); + for (int index = 0; index < list.getLength(); index++) { + Node node = list.item(index); + + parseLine(file, node.getTextContent()); + } + } catch (Exception e) { + throw new ParserException(e); + } + } + + @Override + public void parseLine(File file, String key) throws IOException { + + key = extract(key); + if (key != null) { + setTouched(true); + registerKey(key); + } + } + } +} Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java 2010-11-11 10:52:10 UTC (rev 1794) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java 2010-11-11 10:52:30 UTC (rev 1795) @@ -37,7 +37,9 @@ * @author tchemit <chemit(a)codelutin.com> * @goal parserJavaActionConfig * @phase generate-resources + * @deprecated since 2.0, will not be replaced (was used by {@code jaxx-swing-action} project which is dead...) */ +@Deprecated public class ParserJavaActionConfigMojo extends ParserJavaMojo { protected static final Pattern MATCH_PATTERN = Pattern.compile("(name|shortDescription|longDescription|name2|shortDescription2|longDescription2)\\s*=\\s*\"([\\w|\\.]+)\"(|\\s*|\\s*,\\s*$)"); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.java 2010-11-11 10:52:10 UTC (rev 1794) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.java 2010-11-11 10:52:30 UTC (rev 1795) @@ -31,7 +31,9 @@ * @author tchemit <chemit(a)codelutin.com> * @goal parserJavaTabConfig * @phase generate-resources + * @deprecated since 2.0, will not be replaced (was used by {@code jaxx-swing-action} project which is dead...) */ +@Deprecated public class ParserJavaTabConfigMojo extends ParserJavaActionConfigMojo { @Override 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-11 10:52:10 UTC (rev 1794) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-11-11 10:52:30 UTC (rev 1795) @@ -41,17 +41,16 @@ import java.net.URLConnection; /** - * Récupération des chaine à traduire depuis les fichiers xml de validation. - * - * Le goal doit etre execute avant que les resources soient copiees dans - * target/classes pour rendre operatne le file updater (sinon lesfichiers sont - * toujours a jour...) + * Find i18n keys from xworks xml validation 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 parserValidation * @phase generate-resources */ -public class ParserValidationMojo extends ParserXmlMojo { +public class ParserValidationMojo extends AbstractParserXmlMojo { final URL xworksResource = getClass().getResource("/xwork-validator-1.0.2.dtd"); @@ -70,11 +69,16 @@ protected File cp; /** - * Regles xml. + * Defines the core rules file used to detect i18n keys in xml validation + * files. + * + * Note : If you do not want to use it, set it to empty and fill the + * {@link #userRulesFiles} parameter. * - * @parameter expression="${i18n.rulesValidation}" default-value="validation.rules" + * @parameter expression="${i18n.coreRuleFile}" default-value="validation.rules" + * @since 2.0 */ - protected String rulesValidation; + protected String coreRuleFile; /** * default src for an entry. @@ -92,6 +96,15 @@ */ protected boolean useLocalResolver; + /** + * Defines the file name of the getter where to put detected i18n keys while getter phase. + * + * @parameter expression="${i18n.outputGetter}" default-value="validation.getter" + * @since 2.0 + */ + protected String outputGetter; + + @Override public String[] getDefaultIncludes() { return new String[]{defaultIncludes}; @@ -122,19 +135,14 @@ @Override protected String getOutGetter() { - return "validation.getter"; + return outputGetter; } @Override - protected String getFileRules() { - return rulesValidation; + protected String getCoreRuleFile() { + return coreRuleFile; } - @Override - protected String getCoreFileRules() { - return "validation.rules"; - } - protected XmlFileParser newXmlFileParser(final XPath xpath, final DocumentBuilder builder) { @@ -147,7 +155,7 @@ showTouchedFiles, rules, xpath, - builder) { + builder, namespaces) { @Override public String extract(String i18nString) { String s = null; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java 2010-11-11 10:52:10 UTC (rev 1794) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java 2010-11-11 10:52:30 UTC (rev 1795) @@ -53,7 +53,9 @@ * Récupération des chaines à traduire depuis les fichiers xml. * * @author julien + * @deprecated since 2.0, prefer use the {@link AbstractParserXmlMojo} instead. */ +@Deprecated public abstract class ParserXmlMojo extends AbstractI18nParserMojo { /** Taille du buffer pour les lectures/écritures */ @@ -91,7 +93,6 @@ try { // never forget this! builder = documentBuilderFactory.newDocumentBuilder(); - } catch (ParserConfigurationException ex) { throw new IllegalStateException( "could not load DocumentBuilder for reason " + Added: 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 (rev 0) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java 2010-11-11 10:52:30 UTC (rev 1795) @@ -0,0 +1,168 @@ +/* + * #%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.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; + +/** + * To obtain i18n keys from xml files using the {@code userRulesFiles} (and + * an optional {@code coreRuleFile} if any serves your purpose). + * + * 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 parserXml + * @phase generate-resources + * @since 2.0 + */ +public class ParserXmlUserMojo extends AbstractParserXmlMojo { + + /** + * Default directory where to look for files. + * + * @parameter expression="${i18n.xmlBasedir}" default-value="${basedir}/src/main/resources" + * @required + * @since 2.0 + */ + protected File basedir; + + /** + * Defines files to parse. + * + * @parameter expression="${i18n.xmlIncludes}" + * @required + * @since 2.0 + */ + protected String includes; + + /** + * Defines an optional files which contain xpath rules to obtain i18n + * keys in xml files and is defined in plugin. + * + * @parameter expression="${i18n.coreRuleFiles}" + * @since 2.0 + */ + protected String coreRuleFile; + + /** + * Defines where included files will be copied. + * + * Knowing this permits us to parse included xml files only if they were + * modified from a previous build. + * + * @parameter expression="${i18n.cp}" default-value="${basedir}/target/classes" + * @since 2.0 + */ + protected File cp; + + /** + * Defines the file name of the getter where to put detected i18n keys while getter phase. + * + * @parameter expression="${i18n.outputGetter}" default-value="xmlUser.getter" + * @since 2.0 + */ + protected String outputGetter; + + @Override + public String[] getDefaultIncludes() { + return new String[]{includes}; + } + + @Override + public String[] getDefaultExcludes() { + return I18nSourceEntry.EMPTY_STRING_ARRAY; + } + + @Override + public File getDefaultBasedir() { + return basedir; + } + + @Override + protected String getCoreRuleFile() { + return coreRuleFile; + } + + @Override + protected XmlFileParser newXmlFileParser(XPath xpath, DocumentBuilder builder) { + XmlFileParser fileParser = new XmlFileParser(getLog(), + getEncoding(), + oldParser, + showTouchedFiles, + rules, + xpath, + builder, namespaces) { + @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; + } + }; + return fileParser; + } + + @Override + protected String getOutGetter() { + return outputGetter; + } + + @Override + protected String getKeyModifierStart() { + return null; + } + + @Override + protected String getKeyModifierEnd() { + return null; + } + + @Override + public FileUpdater newFileUpdater(SourceEntry entry) { + return new MirroredFileUpdater("", "", entry.getBasedir(), cp) { + + @Override + public File getMirrorFile(File f) { + String file = + f.getAbsolutePath().substring(prefixSourceDirecotory); + return new File(destinationDirectory + File.separator + file); + } + }; + } +} \ No newline at end of file

1 0

r1794 - trunk/maven-i18n-plugin
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-11 11:52:10 +0100 (Thu, 11 Nov 2010) New Revision: 1794 Url: http://nuiton.org/repositories/revision/i18n/1794 Log: add commons-lang dependencies Modified: trunk/maven-i18n-plugin/pom.xml Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-11-09 10:54:44 UTC (rev 1793) +++ trunk/maven-i18n-plugin/pom.xml 2010-11-11 10:52:10 UTC (rev 1794) @@ -61,7 +61,12 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <!--dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId>

1 0

r1793 - in trunk/maven-i18n-plugin/src/it: . parsers/newProject parsers/withNewKeys parsers/withNewKeys/src/main/resources/i18n
by tchemit＠users.nuiton.org 09 Nov '10

09 Nov '10

Author: tchemit Date: 2010-11-09 11:54:44 +0100 (Tue, 09 Nov 2010) New Revision: 1793 Url: http://nuiton.org/repositories/revision/i18n/1793 Log: fix it + reformat it poms Added: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties Removed: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/it/settings.xml Modified: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2010-11-09 08:39:04 UTC (rev 1792) +++ trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml 2010-11-09 10:54:44 UTC (rev 1793) @@ -28,77 +28,77 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>i18n</artifactId> - <version>@pom.version@</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>@pom.version@</version> + </parent> - <groupId>org.nuiton.i18n</groupId> - <artifactId>parsers-newProject</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>parsers-newProject</artifactId> -  -  -  +  +  +  - <name>I18n Test :: parsers-new</name> + <name>I18n Test :: parsers-new</name> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${project.version}</version> + </dependency> - </dependencies> - - <build> + </dependencies> - <plugins> + <build> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>@pom.version@</version> - <configuration> - <verbose>true</verbose> - </configuration> - <executions> - <execution> - <id>first</id> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - </goals> - </execution> - <execution> -  - <id>second</id> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - </goals> - <phase>compile</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>first</id> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + </goals> + </execution> + <execution> +  + <id>second</id> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2010-11-09 08:39:04 UTC (rev 1792) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml 2010-11-09 10:54:44 UTC (rev 1793) @@ -28,78 +28,78 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>i18n</artifactId> - <version>@pom.version@</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>@pom.version@</version> + </parent> - <groupId>org.nuiton.i18n</groupId> - <artifactId>parsers-withNewKeys</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>parsers-withNewKeys</artifactId> -  -  -  +  +  +  - <name>I18n Test :: parsers-new</name> + <name>I18n Test :: parsers-new</name> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${project.version}</version> + </dependency> - </dependencies> + </dependencies> - <build> + <build> - <plugins> + <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>@pom.version@</version> - <configuration> - <keepGetters>true</keepGetters> - <verbose>true</verbose> - </configuration> - <executions> - <execution> - <id>first</id> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - </execution> - <execution> -  - <id>second</id> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - <phase>compile</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <keepGetters>true</keepGetters> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>first</id> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + </goals> + </execution> + <execution> +  + <id>second</id> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Deleted: 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 2010-11-09 08:39:04 UTC (rev 1792) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties 2010-11-09 10:54:44 UTC (rev 1793) @@ -1,26 +0,0 @@ -### -# #%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% -### -javaGetter.old.key1=hum1 -javaGetter.old.key2=hum2 Copied: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties (from rev 1789, trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties) =================================================================== --- trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties (rev 0) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties 2010-11-09 10:54:44 UTC (rev 1793) @@ -0,0 +1,26 @@ +### +# #%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% +### +javaGetter.old.key1=hum1 +javaGetter.old.key2=hum2 Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties ___________________________________________________________________ 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 2010-11-09 08:39:04 UTC (rev 1792) +++ trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy 2010-11-09 10:54:44 UTC (rev 1793) @@ -39,7 +39,7 @@ assert content.contains( 'validationGetter.key1=' ); assert content.contains( 'validationGetter.key2=' ); -file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys-fr_FR.properties'); +file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); assert file.exists(); content = file.text; Modified: trunk/maven-i18n-plugin/src/it/settings.xml =================================================================== --- trunk/maven-i18n-plugin/src/it/settings.xml 2010-11-09 08:39:04 UTC (rev 1792) +++ trunk/maven-i18n-plugin/src/it/settings.xml 2010-11-09 10:54:44 UTC (rev 1793) @@ -24,58 +24,38 @@ #L% --> - - - <settings> - <profiles> - <profile> - <id>it-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>local.central</id> - <url>file:///@localRepository@</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> - </profiles> + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> </settings>

1 0

r1792 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by athimel＠users.nuiton.org 09 Nov '10

09 Nov '10

Author: athimel Date: 2010-11-09 09:39:04 +0100 (Tue, 09 Nov 2010) New Revision: 1792 Url: http://nuiton.org/repositories/revision/i18n/1792 Log: Orthograph fixes Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-11-08 20:09:24 UTC (rev 1791) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-11-09 08:39:04 UTC (rev 1792) @@ -112,7 +112,7 @@ /** * Un drapeau pour utiliser le répertoire parent du {@link #bundleOutputDir} - * comme répertoire de ressources à ajouter ua build. + * comme répertoire de ressources à ajouter au build. * * Si ce drapeau n'est pas activé, alors on utilise directement le répertoire donné. * @@ -235,7 +235,7 @@ if (generateDefinitionFile) { // ecriture du ficher des definitions i18n (permet de faire une - // recherche extact sur un fichier puis d'en deduire les bundles a + // recherche exacte sur un fichier puis d'en deduire les bundles a // charger String f = String.format(DefaultI18nInitializer.UNIQUE_BUNDLE_DEF, bundleOutputName);

1 0

r1791 - in trunk: . ant-i18n-task maven-i18n-plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle nuiton-i18n
by tchemit＠users.nuiton.org 08 Nov '10

08 Nov '10

Author: tchemit Date: 2010-11-08 21:09:24 +0100 (Mon, 08 Nov 2010) New Revision: 1791 Url: http://nuiton.org/repositories/revision/i18n/1791 Log: pass to version 2.0-SNAPSHOT Evolution #1020: Add addBundleOuputDirParent parameter in BundleMojo Evolution #1021: Add generateDefinitionFile parameter in BundleMojo Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2010-11-08 15:09:17 UTC (rev 1790) +++ trunk/ant-i18n-task/pom.xml 2010-11-08 20:09:24 UTC (rev 1791) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-11-08 15:09:17 UTC (rev 1790) +++ trunk/maven-i18n-plugin/pom.xml 2010-11-08 20:09:24 UTC (rev 1791) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-11-08 15:09:17 UTC (rev 1790) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-11-08 20:09:24 UTC (rev 1791) @@ -97,7 +97,6 @@ * vides. * * @parameter expression="${i18n.checkBundle}" default-value="true" - * @required * @since 1.0.0 */ protected boolean checkBundle; @@ -107,11 +106,33 @@ * #checkBundle} activé). * * @parameter expression="${i18n.showEmpty}" default-value="false" - * @required * @since 1.0.0 */ protected boolean showEmpty; + /** + * Un drapeau pour utiliser le répertoire parent du {@link #bundleOutputDir} + * comme répertoire de ressources à ajouter ua build. + * + * Si ce drapeau n'est pas activé, alors on utilise directement le répertoire donné. + * + * @parameter expression="${i18n.addBundleOuputDirParent}" default-value="true" + * @since 2.0 + */ + protected boolean addBundleOuputDirParent; + + /** + * Un drapeau pour générer le fichier de définition i18n. + * + * Ce fichier permet d'avoir les locales utilisables par I18n ainsi que les + * chemins (dans le classpath) des resources i18n utilisées pour construire + * le bundle final. + * + * @parameter expression="${i18n.generateDefinitionFile}" default-value="true" + * @since 2.0 + */ + protected boolean generateDefinitionFile; + @Override public void init() throws Exception { super.init(); @@ -121,7 +142,12 @@ // ajout de repertoire de generation (le parent en fait) // dans les resources du projet - addResourceDir(bundleOutputDir.getParentFile(), "**/*.properties"); + File ressourceDir = bundleOutputDir; + + if (addBundleOuputDirParent) { + ressourceDir = ressourceDir.getParentFile(); + } + addResourceDir(ressourceDir, "**/*.properties"); } @Override @@ -206,30 +232,33 @@ } } - // ecriture du ficher des definitions i18n (permet de faire une - // recherche extact sur un fichier puis d'en deduire les bundles a - // charger - String f = String.format(DefaultI18nInitializer.UNIQUE_BUNDLE_DEF, - bundleOutputName); - File defOut = new File(bundleOutputDir, f); - if (!silent) { - getLog().info("prepare i18n definition " + - defOut.getAbsolutePath()); + if (generateDefinitionFile) { + + // ecriture du ficher des definitions i18n (permet de faire une + // recherche extact sur un fichier puis d'en deduire les bundles a + // charger + String f = String.format(DefaultI18nInitializer.UNIQUE_BUNDLE_DEF, + bundleOutputName); + File defOut = new File(bundleOutputDir, f); + if (!silent) { + getLog().info("prepare i18n definition " + + defOut.getAbsolutePath()); + } + SortedProperties p = new SortedProperties(encoding, false); + p.setProperty(DefaultI18nInitializer.BUNDLE_DEF_LOCALES, bundles); + p.setProperty(DefaultI18nInitializer.BUNDLE_DEF_VERSION, version); + for (Entry<Locale, String> e : bundleDico.entrySet()) { + p.setProperty(DefaultI18nInitializer.BUNDLES_FOR_LOCALE + + e.getKey().toString(), e.getValue()); + } + FileOutputStream out = new FileOutputStream(defOut); + try { + p.store(out, null); + } finally { + out.close(); + } + } - SortedProperties p = new SortedProperties(encoding, false); - p.setProperty(DefaultI18nInitializer.BUNDLE_DEF_LOCALES, bundles); - p.setProperty(DefaultI18nInitializer.BUNDLE_DEF_VERSION, version); - for (Entry<Locale, String> e : bundleDico.entrySet()) { - p.setProperty(DefaultI18nInitializer.BUNDLES_FOR_LOCALE + - e.getKey().toString(), e.getValue()); - } - FileOutputStream out = new FileOutputStream(defOut); - try { - p.store(out, null); - } finally { - out.close(); - } - if (!silent && verbose) { getLog().info("done in " + PluginHelper.convertTime(t00, System.nanoTime())); Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2010-11-08 15:09:17 UTC (rev 1790) +++ trunk/nuiton-i18n/pom.xml 2010-11-08 20:09:24 UTC (rev 1791) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-08 15:09:17 UTC (rev 1790) +++ trunk/pom.xml 2010-11-08 20:09:24 UTC (rev 1791) @@ -39,7 +39,7 @@ </parent> <artifactId>i18n</artifactId> - <version>1.2.3-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <modules> <module>nuiton-i18n</module>

1 0

r1790 - trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle
by tchemit＠users.nuiton.org 08 Nov '10

08 Nov '10

Author: tchemit Date: 2010-11-08 16:09:17 +0100 (Mon, 08 Nov 2010) New Revision: 1790 Url: http://nuiton.org/repositories/revision/i18n/1790 Log: add doc + improve code Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-11-08 10:28:45 UTC (rev 1789) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-11-08 15:09:17 UTC (rev 1790) @@ -205,16 +205,7 @@ I18nArtifact i18nArtifact; for (Object o : project.getArtifacts()) { i18nArtifact = new I18nArtifact((Artifact) o); - if (i18nArtifact.detectBundles()) { - if (!silent) { - getLog().info("detected i18n artifact " + i18nArtifact); - } - dico.put(i18nArtifact.getArtifact(), i18nArtifact); - } else { - if (getLog().isDebugEnabled()) { - getLog().debug("reject artifact " + i18nArtifact); - } - } + detectBundles(i18nArtifact, null, dico); } ArtifactFilter artifactFilter @@ -233,25 +224,34 @@ // bundles alors ils doivent etre charge en dernier Artifact projectArtifact = project.getArtifact(); + + i18nArtifact = new I18nArtifact(projectArtifact, src.getParentFile()); + detectBundles(i18nArtifact, artifacts, dico); + I18nArtifact[] result = new I18nArtifact[artifacts.size()]; + int i = 0; + for (Artifact artifact : artifacts) { + result[i++] = dico.get(artifact); + } + return result; + } + + protected void detectBundles(I18nArtifact i18nArtifact, + List<Artifact> artifacts, + Map<Artifact, I18nArtifact> dico) throws IOException { if (i18nArtifact.detectBundles()) { if (!silent) { getLog().info("detected i18n artifact " + i18nArtifact); } - artifacts.add(i18nArtifact.getArtifact()); + if (artifacts != null) { + artifacts.add(i18nArtifact.getArtifact()); + } dico.put(i18nArtifact.getArtifact(), i18nArtifact); } else { if (getLog().isDebugEnabled()) { getLog().debug("reject artifact " + i18nArtifact); } } - - I18nArtifact[] result = new I18nArtifact[artifacts.size()]; - int i = 0; - for (Artifact artifact : artifacts) { - result[i++] = dico.get(artifact); - } - return result; } } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java 2010-11-08 10:28:45 UTC (rev 1789) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java 2010-11-08 15:09:17 UTC (rev 1790) @@ -80,6 +80,13 @@ return I18nBundleUtil.getBundleEntries(l, defaultLocale, bundles); } + /** + * Detects the i18n bundles for this artifacts, says in i18n directory. + * + * @return {@code true} if artifact has some i18n bunbles, {@code false} + * otherwise. + * @throws IOException if any IO error. + */ public boolean detectBundles() throws IOException { URL[] i18nUrls = I18nBundleUtil.getURLs(url);

1 0

r1789 - in trunk/nuiton-i18n/src/main/java/org/nuiton/i18n: . bundle init
by tchemit＠users.nuiton.org 08 Nov '10

08 Nov '10

Author: tchemit Date: 2010-11-08 11:28:45 +0100 (Mon, 08 Nov 2010) New Revision: 1789 Url: http://nuiton.org/repositories/revision/i18n/1789 Log: box log invocation with if (log.isXXX) Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -180,9 +180,11 @@ try { return applyFilter(String.format(message, args)); } catch (Exception zzz) { - log.warn( - _("nuitonutil.error.i18n.untranslated.message", message), - zzz); + if (log.isWarnEnabled()) { + log.warn( + _("nuitonutil.error.i18n.untranslated.message", message), + zzz); + } return applyFilter(message); } } @@ -213,9 +215,11 @@ try { return String.format(message, args); } catch (Exception eee) { - log.warn( - _("nuitonutil.error.i18n.unformated.message", message, Arrays.toString(args)), - eee); + if (log.isWarnEnabled()) { + log.warn( + _("nuitonutil.error.i18n.unformated.message", message, Arrays.toString(args)), + eee); + } return message; } } @@ -267,7 +271,7 @@ * * @return the instanciated i18n store */ - public static synchronized I18nStore getStore() { + public static I18nStore getStore() { if (store == null) { store = new I18nStore(DEFAULT_LOCALE, initializer); Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -146,10 +146,14 @@ recordNotFound(sentence); return sentence; } catch (MissingResourceException eee) { - log.warn("Resource " + sentence + " unavailable", eee); + if (log.isWarnEnabled()) { + log.warn("Resource " + sentence + " unavailable", eee); + } return sentence; } catch (Exception eee) { - log.error("Unexpected error while translating : ", eee); + if (log.isErrorEnabled()) { + log.error("Unexpected error while translating : ", eee); + } return sentence; } } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -151,7 +151,7 @@ * * @param locale la locale du language requis */ - protected synchronized void setLanguage(Locale locale) { + protected void setLanguage(Locale locale) { init(); if (log.isDebugEnabled()) { log.debug("locale: " + locale); Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -56,6 +56,8 @@ public static final Locale DEFAULT_LOCALE = Locale.UK; + public static final String[] EMPTY_STRING_ARRAY = new String[0]; + /** * Parse a list of {@link Locale} seperated by comma. * @@ -92,8 +94,9 @@ try { return (Locale) new LocaleConverter().convert(Locale.class, str); } catch (Exception e) { - log.warn("could not load locale '" + str + " for reason : " + + if (log.isWarnEnabled()) {log.warn("could not load locale '" + str + " for reason : " + e.getMessage()); + } // use default locale return DEFAULT_LOCALE; } @@ -340,7 +343,7 @@ if (classPath != null) { paths = classPath.split(" "); } else { - paths = new String[0]; + paths = EMPTY_STRING_ARRAY; } result = new URL[paths.length + 1]; result[0] = jarURL; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -165,7 +165,7 @@ entries = new ArrayList<I18nBundleEntry>(); } boolean b = entries.add(entry); - if (log.isDebugEnabled()) { + if (log.isInfoEnabled()) { log.info(this + "\n\t" + entry); } return b; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -132,7 +132,8 @@ private static final long serialVersionUID = 1L; - public void load(InputStream inStream) throws IOException { + @Override + public synchronized void load(InputStream inStream) throws IOException { String charset = I18nUtil.ISO_8859_1_ENCONDING; Charset charsetTo = Charset.forName(charset); Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -31,11 +31,17 @@ import java.io.File; import java.io.FileInputStream; -import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Set; import java.util.regex.Matcher; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -265,8 +271,10 @@ } return listURLs.toArray(new URL[listURLs.size()]); } catch (Exception eee) { - log.warn("Unable to find urls for urls : " + Arrays.toString(urls) + - " for reason " + eee.getMessage(), eee); + if (log.isWarnEnabled()) { + log.warn("Unable to find urls for urls : " + Arrays.toString(urls) + + " for reason " + eee.getMessage(), eee); + } return EMPTY_URL_ARRAY; } } @@ -398,15 +406,19 @@ if (bundle.size() == 0) { // there is no entry to take... - log.warn("PROMUTE NO ENTRY FOUND"); + if (log.isWarnEnabled()) { + log.warn("PROMUTE NO ENTRY FOUND"); + } return EMPTY_I18N_BUNDLE_ENTRYS_ARRAY; } if (bundle.size() == 1) { // there is one entry take it,what ever... I18nBundleEntry entry = bundle.getEntries().get(0); - log.warn("PROMUTE" + l + " to " + entry.getLocale() + - " [" + bundle.getBundlePrefix() + ']'); + if (log.isWarnEnabled()) { + log.warn("PROMUTE" + l + " to " + entry.getLocale() + + " [" + bundle.getBundlePrefix() + ']'); + } return new I18nBundleEntry[]{entry}; } @@ -446,8 +458,10 @@ if (i18nBundleScope == I18nBundleScope.FULL && !locale1.getCountry().equals(locale.getCountry()) && locale1.getLanguage().equals(locale.getLanguage())) { - log.warn(locale + " to " + locale1 + - " [" + bundle.getBundlePrefix() + ']'); + if (log.isWarnEnabled()) { + log.warn(locale + " to " + locale1 + + " [" + bundle.getBundlePrefix() + ']'); + } result.add(entry); // we take the first one, this is a resuce!!! break; @@ -477,8 +491,10 @@ if (i18nBundleScope == I18nBundleScope.FULL && locale1.getLanguage().equals(locale.getLanguage())) { result.add(entry); - log.warn(locale + " to " + locale1 + " [" + - bundle.getBundlePrefix() + ']'); + if (log.isWarnEnabled()) { + log.warn(locale + " to " + locale1 + " [" + + bundle.getBundlePrefix() + ']'); + } // we take the first one, this is a resuce!!! break; } @@ -500,16 +516,20 @@ // there is one entry take it,what ever... I18nBundleEntry entry = bundle.getEntries().get(0); result.add(entry); - log.warn(locale + " to " + entry.getLocale() + " [" + - bundle.getBundlePrefix() + ']'); + if (log.isWarnEnabled()) { + log.warn(locale + " to " + entry.getLocale() + " [" + + bundle.getBundlePrefix() + ']'); + } return; } I18nBundleScope scope = I18nBundleScope.valueOf(defaultLocale); for (I18nBundleEntry entry : bundle.getEntries(scope)) { if (entry.getLocale().equals(defaultLocale)) { // default locale found - log.warn(locale + " to " + entry.getLocale() + " [" + - bundle.getBundlePrefix() + ']'); + if (log.isWarnEnabled()) { + log.warn(locale + " to " + entry.getLocale() + " [" + + bundle.getBundlePrefix() + ']'); + } result.add(entry); return; } @@ -518,8 +538,10 @@ // default locale not found, take the first one ? I18nBundleEntry entry = bundle.getEntries().get(0); result.add(entry); - log.warn(locale + " to " + entry.getLocale() + " [" + - bundle.getBundlePrefix() + ']'); + if (log.isWarnEnabled()) { + log.warn(locale + " to " + entry.getLocale() + " [" + + bundle.getBundlePrefix() + ']'); + } //TODO Should try to load default en_GB from I18nLoader ? //I18n.DEFAULT_LOCALE.getCountry() } @@ -528,36 +550,38 @@ String pattern = SEARCH_BUNDLE_PATTERN; try { + ZipInputStream zis = new ZipInputStream(new FileInputStream(jarfile)); + try { + List<URL> result = new ArrayList<URL>(); + ClassLoader cl = new URLClassLoader( + new URL[]{incomingURL}, + I18nBundleUtil.class.getClassLoader()); + while (zis.available() != 0) { + ZipEntry entry = zis.getNextEntry(); - List<URL> result = new ArrayList<URL>(); - InputStream in = new FileInputStream(jarfile); - ZipInputStream zis = new ZipInputStream(in); - ClassLoader cl = new URLClassLoader( - new URL[]{incomingURL}, - I18nBundleUtil.class.getClassLoader()); - while (zis.available() != 0) { - ZipEntry entry = zis.getNextEntry(); + if (entry == null) { + break; + } - if (entry == null) { - break; - } + String name = entry.getName(); - String name = entry.getName(); - - if (name.matches(pattern)) { - // on recupere le fichier correspondant au pattern dans le - // classloader - if (log.isDebugEnabled()) { - log.debug(name + " accepted for pattern " + pattern); + if (name.matches(pattern)) { + // on recupere le fichier correspondant au pattern dans le + // classloader + if (log.isDebugEnabled()) { + log.debug(name + " accepted for pattern " + pattern); + } + URL url = cl.getResource(name); + // on ajoute le fichier correspondant au pattern dans la + // liste + result.add(url); } - URL url = cl.getResource(name); - // on ajoute le fichier correspondant au pattern dans la - // liste - result.add(url); } + + return result; + } finally { + zis.close(); } - - return result; } catch (Exception eee) { throw new RuntimeException( "n'a pas pu trouve la resource dans le jar " + Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2010-11-08 10:28:15 UTC (rev 1788) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2010-11-08 10:28:45 UTC (rev 1789) @@ -49,7 +49,7 @@ public static String UNIQUE_BUNDLE_DEF = "%1$s-definition.properties"; - public static String UNIQUE_BUNDLE_ENTRY = "%1$s-%2$s.properties"; + public static String UNIQUE_BUNDLE_ENTRY = "%1$s_%2$s.properties"; public static String BUNDLE_DEF_LOCALES = "locales";

1 0

r1788 - in trunk: maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin nuiton-i18n/src/main/java/org/nuiton/i18n/bundle nuiton-i18n/src/test/resources/META-INF
by tchemit＠users.nuiton.org 08 Nov '10

08 Nov '10

Author: tchemit Date: 2010-11-08 11:28:15 +0100 (Mon, 08 Nov 2010) New Revision: 1788 Url: http://nuiton.org/repositories/revision/i18n/1788 Log: Anomalie #1018: Use a resource bundle api compatible name for translation files Added: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties Removed: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-11-08 10:28:15 UTC (rev 1788) @@ -199,7 +199,7 @@ Locale locale, boolean create) throws IOException { File file = new File( root.getAbsolutePath() + File.separatorChar + artifactId + - "-" + locale.toString() + ".properties"); + "_" + locale.toString() + ".properties"); if (create && !file.exists()) { createNewFile(file); } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java 2010-11-08 10:28:15 UTC (rev 1788) @@ -73,7 +73,7 @@ }, /** language scope (no country information) */ - LANGUAGE("(.*/.+)-(\\w\\w)\\.properties") { + LANGUAGE("(.*/.+)_(\\w\\w)\\.properties") { @Override public Locale getLocale(Matcher matcher) { Locale result = null; @@ -85,7 +85,7 @@ }, /** full scope : language + country */ - FULL("(.*/.+)-(\\w\\w_\\w\\w)\\.properties") { + FULL("(.*/.+)_(\\w\\w_\\w\\w)\\.properties") { @Override public Locale getLocale(Matcher matcher) { Locale result = null; Modified: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -23,6 +23,6 @@ # #L% ### #Sun Mar 07 00:23:58 CET 2010 -bundles.en_GB=bundleTest/I18nStoreTest-en_GB.properties -bundles.fr_FR=bundleTest/I18nStoreTest-fr_FR.properties +bundles.en_GB=bundleTest/I18nStoreTest_en_GB.properties +bundles.fr_FR=bundleTest/I18nStoreTest_fr_FR.properties locales=fr_FR,en_GB Deleted: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -1,26 +0,0 @@ -### -# #%L -# I18n :: Api -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 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% -### -key.one=First -key.two=Second Deleted: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties 2010-11-08 09:32:44 UTC (rev 1787) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -1,26 +0,0 @@ -### -# #%L -# I18n :: Api -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 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% -### -key.one=Premier -key.two=Seconde Copied: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties (from rev 1786, trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-en_GB.properties) =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties (rev 0) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -0,0 +1,26 @@ +### +# #%L +# I18n :: Api +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 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% +### +key.one=First +key.two=Second Property changes on: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties (from rev 1786, trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-fr_FR.properties) =================================================================== --- trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties (rev 0) +++ trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties 2010-11-08 10:28:15 UTC (rev 1788) @@ -0,0 +1,26 @@ +### +# #%L +# I18n :: Api +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 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% +### +key.one=Premier +key.two=Seconde Property changes on: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0