Author: chemit Date: 2008-11-30 19:16:00 +0000 (Sun, 30 Nov 2008) New Revision: 1265 Modified: commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorGoal.java commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-en_GB.properties commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-fr_FR.properties Log: make rst goal works again (after i18n loading has changed) Modified: commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java =================================================================== --- commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java 2008-11-30 19:14:55 UTC (rev 1264) +++ commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorContext.java 2008-11-30 19:16:00 UTC (rev 1265) @@ -117,9 +117,9 @@ result = new URLClassLoader(url, getClass().getClassLoader()); } } catch (MalformedURLException eee) { - throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", getOut(), eee.getMessage()), eee); + throw new RuntimeException(_("commandline.error.loader", getOut(), eee.getMessage()), eee); } catch (IOException e) { - throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", getOut(), e.getMessage()), e); + throw new RuntimeException(_("commandline.error.loader", getOut(), e.getMessage()), e); } loader = result; } Modified: commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorGoal.java =================================================================== --- commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorGoal.java 2008-11-30 19:14:55 UTC (rev 1264) +++ commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorGoal.java 2008-11-30 19:16:00 UTC (rev 1265) @@ -51,7 +51,7 @@ * le chemin ou trouver les fichiers de traductions pour l'initialisation I18N, sinon le fichier du * plugin est utilise, alors qu'il faut que ce soit celui de l'application * - * @parameter expression="${commandline.i18nCP}" default-value="${basedir}/src/resources" + * @parameter expression="${commandline.i18nCP}" default-value="${basedir}/src/main/resources" */ protected File i18nCP; @@ -87,12 +87,9 @@ List<OptionKey> optionKeys = ReflectUtil.getConstants(getContext().getParserClass(), OptionKey.class); List<ConfigKey> configKeys = ReflectUtil.getConstants(getContext().getContextClass(), ConfigKey.class); - // find bundles for the project - URL[] urls = Resource.getURLs(I18nBundleManager.SEARCH_BUNDLE_PATTERN, getI18nCP().toURI().toURL()).toArray(new URL[2]); + // set extra urls (will reset i18n manager) + I18n.setExtraURL(new URL[]{getI18nCP().toURI().toURL()}); - // set extra urls (will reset i18n manager) - I18n.setExtraURL(urls); - for (String bundle : getBundles()) { String pattern = getContext().getRstFilePath(); Modified: commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-en_GB.properties =================================================================== --- commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-en_GB.properties 2008-11-30 19:14:55 UTC (rev 1264) +++ commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-en_GB.properties 2008-11-30 19:16:00 UTC (rev 1265) @@ -1,6 +1,5 @@ -Can't\ create\ ClassLoader\ for\ script,\ bad\ directory\:\ {0}\ for\ reason\ %2$s= -Can't\ create\ ClassLoader\ for\ script,\ bad\ directory\:\ {0}\ for\ reason\ {1}= -commandline.generateRstFile.configs.head=Configurations of **{0}** +commandline.error.loader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s. +commandline.generateRstFile.configs.head=Configurations of **%1$s** commandline.generateRstFile.head=**%1$s**'s usage commandline.generateRstFile.info=[generateRstFile] %1$s commandline.generateRstFile.options.head=Launch commands Modified: commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-fr_FR.properties =================================================================== --- commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-fr_FR.properties 2008-11-30 19:14:55 UTC (rev 1264) +++ commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-fr_FR.properties 2008-11-30 19:16:00 UTC (rev 1265) @@ -1,5 +1,4 @@ -Can't\ create\ ClassLoader\ for\ script,\ bad\ directory\:\ %1$s\ for\ reason\ {1}= -Can't\ create\ ClassLoader\ for\ script,\ bad\ directory\:\ {0}\ for\ reason\ {1}= +commandline.error.loader=Can't create ClassLoader for script, bad directory\: %1$s for reason %2$s. commandline.generateRstFile.configs.head=Les configurations de **%1$s** commandline.generateRstFile.head=Guide d'utilisation de **%1$s** commandline.generateRstFile.info=[generateRstFile] %1$s