Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java:1.1 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java:1.2 --- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java:1.1 Fri Oct 26 14:56:39 2007 +++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java Fri Oct 26 15:39:23 2007 @@ -47,6 +47,10 @@ */ protected File outJava; + /* + * (non-Javadoc) + * @see org.apache.maven.plugin.AbstractMojo#execute() + */ public void execute() throws MojoExecutionException, MojoFailureException { if(gen) { Set artifacts = project.getArtifacts(); @@ -76,8 +80,14 @@ } } } - - private File extract(String zipName, String fileName) { + + /** + * Extrait un fichier i18n d'une librairie + * @param zipName + * @param fileName + * @return + */ + protected File extract(String zipName, String fileName) { try { ZipFile file = new JarFile(zipName); ZipEntry entry = file.getEntry("i18n/" + fileName); @@ -101,5 +111,4 @@ } return null; } - } Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Getter.java diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Getter.java:1.1 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Getter.java:1.2 --- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Getter.java:1.1 Fri Oct 26 14:56:39 2007 +++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Getter.java Fri Oct 26 15:39:23 2007 @@ -5,11 +5,11 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.DirectoryScanner; import org.codelutin.util.FileUtil; /** + * Récupère les différents fichiers des parseurs en un fichier de propriétés. * * @author julien * @@ -18,8 +18,10 @@ */ public class Getter extends AbstractI18nPlugin { - protected MavenProject project; - + /* + * (non-Javadoc) + * @see org.apache.maven.plugin.AbstractMojo#execute() + */ public void execute() throws MojoExecutionException, MojoFailureException { try { File bundleGetters = new File(out.getAbsolutePath() + File.separatorChar + "language.properties"); @@ -30,10 +32,11 @@ ds.scan(); String[] files = ds.getIncludedFiles(); + // Fusion des fichiers propriétés des différents parseurs for (int i = 0; i < files.length; i++) { File bundleGetter = new File(out.getAbsolutePath() + File.separatorChar + files[i]); concactProperties(bundleGetter, bundleGetters); -// bundleGetter.delete(); + bundleGetter.delete(); } // Création des bundles @@ -42,6 +45,8 @@ FileUtil.copy(bundleGetters, bundleOut); log.info("Generate bundle " + bundleOut.getAbsolutePath()); } + + bundleGetters.delete(); } catch (IOException e) { log.error("File Error I/O ", e); throw new MojoFailureException("File Error I/O"); Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java:1.1 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java:1.2 --- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java:1.1 Fri Oct 26 14:56:39 2007 +++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java Fri Oct 26 15:39:23 2007 @@ -1,6 +1,7 @@ package org.codelutin.i18n.plugin.core; import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -8,8 +9,12 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.StringReader; import java.util.Properties; +import java.util.jar.JarFile; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.logging.Log; @@ -69,7 +74,7 @@ * @throws FileNotFoundException * @throws IOException */ - protected static void concactProperties(File in, File out) throws FileNotFoundException, IOException { + protected void concactProperties(File in, File out) throws FileNotFoundException, IOException { Properties propertiesIn = new SortedProperties(); propertiesIn.load(new FileInputStream(in)); Index: maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java diff -u maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java:1.1 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java:1.2 --- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java:1.1 Fri Oct 26 14:56:39 2007 +++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java Fri Oct 26 15:39:23 2007 @@ -13,6 +13,7 @@ import org.codelutin.util.FileUtil; /** + * Merge des fichiers de propriétés avec les anciens. * * @author julien * @@ -35,6 +36,10 @@ */ protected File outJava; + /* + * (non-Javadoc) + * @see org.apache.maven.plugin.AbstractMojo#execute() + */ public void execute() throws MojoExecutionException, MojoFailureException { for (String bundle : bundles) { // Merge @@ -65,7 +70,6 @@ throw new MojoFailureException("Could not execute " + msgmergeCmd + "."); } - log.info("Merge bundle " + bundleSrc.getAbsolutePath()); }