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.5 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java:1.6 --- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java:1.5 Fri Nov 2 16:06:37 2007 +++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Generate.java Tue Nov 6 11:58:42 2007 @@ -82,7 +82,10 @@ // Récupération dans les libs les fichiers de traduction for (Artifact artifact : artifacts) { - File libBundle = extract(artifact.getFile().getAbsolutePath(), "language-" + bundle + ".properties"); + String fileName = artifact.getArtifactId() + "-" + bundle + ".properties"; + File libBundle = extract(artifact.getFile().getAbsolutePath(), + DIRECTORY_INSTALL + fileName, + out.getAbsolutePath() + File.separatorChar + fileName); if(libBundle != null) { concactProperties(libBundle, bundleOut); @@ -106,17 +109,18 @@ /** * Extrait un fichier i18n d'une librairie * @param zipName - * @param fileName + * @param fileNameIn + * @param fileNameOut * @return */ - protected File extract(String zipName, String fileName) { + protected File extract(String zipName, String fileNameIn, String fileNameOut) { try { ZipFile file = new JarFile(zipName); - ZipEntry entry = file.getEntry("i18n/" + fileName); + ZipEntry entry = file.getEntry(fileNameIn); if(entry != null) { InputStream in = file.getInputStream(entry); - File target = new File(out, fileName); - + File target = new File(fileNameOut); + OutputStream out = new BufferedOutputStream(new FileOutputStream(target)); byte[] buffer = new byte[BUFFER_SIZE]; int len = 0; 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.7 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java:1.8 --- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java:1.7 Fri Nov 2 16:06:37 2007 +++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/AbstractI18nPlugin.java Tue Nov 6 11:58:42 2007 @@ -79,6 +79,12 @@ protected Log log = getLog(); /** + * Répertoire de stockage des fichiers i18n pour la récupération des fichiers + * de traduction entre librairie + */ + protected static String DIRECTORY_INSTALL = "i18n" + File.separatorChar; + + /** * Liste des événements */ protected List events = new ArrayList(); 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.4 maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java:1.5 --- maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java:1.4 Fri Nov 2 16:06:37 2007 +++ maven-i18n-plugin/src/java/org/codelutin/i18n/plugin/core/Merge.java Tue Nov 6 11:58:42 2007 @@ -54,6 +54,14 @@ */ protected File outJava; + + /** + * @description Nom du projet. + * @parameter expression="${i18n.artifactId}" default-value="${project.artifactId}" + * @readonly + */ + protected String artifactId; + /* * (non-Javadoc) * @see org.apache.maven.plugin.AbstractMojo#execute() @@ -106,7 +114,7 @@ } // Copie dans le classes - File bundleJava = new File(outJava.getAbsolutePath() + File.separatorChar + "i18n" + File.separatorChar + "language-" + bundle + ".properties"); + File bundleJava = new File(outJava.getAbsolutePath() + File.separatorChar + DIRECTORY_INSTALL + artifactId + "-" + bundle + ".properties"); FileUtil.copy(bundleOut, bundleJava); log.info("Copy bundle " + bundleJava.getAbsolutePath());