[Lutinutil-commits] r1262 - in commandline/trunk: . commandline-core/src/main/resources/i18n commandline-demo commandline-demo/src/main/java/org/codelutin/commandline/demo commandline-ui-action/src/main/resources/i18n maven-commandline-plugin maven-commandline-plugin/src/main/java/org/codelutin/option/generate maven-commandline-plugin/src/main/resources/i18n maven-commandline-plugin/src/test/java/org/codelutin/option/generate
Author: chemit Date: 2008-11-30 18:50:25 +0000 (Sun, 30 Nov 2008) New Revision: 1262 Modified: commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-en_GB.properties commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-fr_FR.properties commandline/trunk/commandline-demo/pom.xml commandline/trunk/commandline-demo/run-demo.sh commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties commandline/trunk/maven-commandline-plugin/pom.xml commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.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 commandline/trunk/maven-commandline-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java commandline/trunk/pom.xml Log: only generate config if some found :) dump to lutinutil 1.0-SNAPSHOT (i18n) use org.codelutin libraries (no more lutinlib ones) Modified: commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-en_GB.properties =================================================================== --- commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-en_GB.properties 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-en_GB.properties 2008-11-30 18:50:25 UTC (rev 1262) @@ -2,25 +2,25 @@ commandline.context.error.multicontextfound=More than one Context was found in classpath, this is forbidden commandline.context.error.noinit=The context was not init (use before all ContextProvider\#init() method commandline.context.error.unfound=Could not find a Context in the classpath -lutinutil.change.config.property=changed for configuration {0} property {1} <old\: {2}, new\: {3}> -lutinutil.error.config.unauthorized.key=The given key {0} is not autohrized, list of authorized keys {1} -lutinutil.error.final.property=In configuration [{0}], can not modify the final property {1} -lutinutil.error.parser.convertor=could not convert argument value {0} to type {1} -lutinutil.error.parser.too.less.option.found=the option {0} si required at least {1} times, and was found {2} times. -lutinutil.error.parser.unfound.mandatory.argument=It miss the mandatory argument {0} in the group {1}, found {2} -lutinutil.error.parser.unfound.mandatory.group=It miss a argument in a mandatory group {0} for option {1} -lutinutil.error.parser.unfound.mandatory.option=It miss a mandatory option {0} -lutinutil.error.parser.valued.argument.unfound=could not found a option argument definition with key {0} in {1} -lutinutil.error.unfound.config.property=could not find for configuration {0} property ''{1}'' +lutinutil.change.config.property=changed for configuration %1$s property %2$s <old\: %3$s, new\: %4$s> +lutinutil.error.config.unauthorized.key=The given key %1$s is not autohrized, list of authorized keys %2$s +lutinutil.error.final.property=In configuration [%1$s], can not modify the final property %2$s +lutinutil.error.parser.convertor=could not convert argument value %1$s to type %2$s +lutinutil.error.parser.too.less.option.found=the option %1$s si required at least %2$s times, and was found %3$s times. +lutinutil.error.parser.unfound.mandatory.argument=It miss the mandatory argument %1$s in the group %2$s, found %3$s +lutinutil.error.parser.unfound.mandatory.group=It miss a argument in a mandatory group %1$s for option %2$s +lutinutil.error.parser.unfound.mandatory.option=It miss a mandatory option %1$s +lutinutil.error.parser.valued.argument.unfound=could not found a option argument definition with key %1$s in %2$s +lutinutil.error.unfound.config.property=could not find for configuration %1$s property '%2$s' lutinutil.message.reset.user.configuration=reset your configuration -lutinutil.parser.unavailable.option=the option {0} is no more available at position {1}. -lutinutil.parser.unavailable.option.argument=the option {0} is full, can not place treate the argument {1} at position {2} -lutinutil.parser.unknown.option=unknown option with key {0} at position {1} -lutinutil.parserdef.printError=Some errors or unused arguments were found while parsing \: {0} -lutinutil.parserdef.printError.error=\nerror {0}/{1}\n -lutinutil.parserdef.printError.head=Found {0} error(s) while parsing definitions -lutinutil.parserdef.printError.unused=\nunused {0}/{1} at position {2}\n -lutinutil.parserdef.printError.unused.head=Found {0} unused argument(s) while parsing definitions -lutinutil.parserdef.printUsage.configs.head=Description of **{0}** configurations -lutinutil.parserdef.printUsage.head=Usage of application ''{0}'' +lutinutil.parser.unavailable.option=the option %1$s is no more available at position %2$s. +lutinutil.parser.unavailable.option.argument=the option %1$s is full, can not place treate the argument %2$s at position %3$s +lutinutil.parser.unknown.option=unknown option with key %1$s at position %2$s +lutinutil.parserdef.printError=Some errors or unused arguments were found while parsing \: %1$s +lutinutil.parserdef.printError.error=\nerror %1$s/%2$s\n +lutinutil.parserdef.printError.head=Found %1$s error(s) while parsing definitions +lutinutil.parserdef.printError.unused=\nunused %1$s/%2$s at position %3$s\n +lutinutil.parserdef.printError.unused.head=Found %1$s unused argument(s) while parsing definitions +lutinutil.parserdef.printUsage.configs.head=Description of **%1$s** configurations +lutinutil.parserdef.printUsage.head=Usage of application '%1$s' lutinutil.parserdef.printUsage.options.head=Launch commands Modified: commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-fr_FR.properties =================================================================== --- commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-fr_FR.properties 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/commandline-core/src/main/resources/i18n/commandline-core-fr_FR.properties 2008-11-30 18:50:25 UTC (rev 1262) @@ -2,25 +2,25 @@ commandline.context.error.multicontextfound=Plusieurs context ont \u00E9t\u00E9 trouv\u00E9s dans le classpath, ce qui est interdit commandline.context.error.noinit=Le context n'a pas \u00E9t\u00E9 initialis\u00E9, il faut utiliser la m\u00E9thode ContextProvier\#init() avant commandline.context.error.unfound=Aucun Context n'a \u00E9t\u00E9 trouv\u00E9 dans le classpath -lutinutil.change.config.property=modification pour la configuration {0} propri\u00E9t\u00E9 {1} <old\: {2}, new\: {3}> -lutinutil.error.config.unauthorized.key=La clef {0} n''est pas autoris\u00E9, liste des clefs possibles {1} -lutinutil.error.final.property=Dans la configuration [{0}], impossible de modifier la propri\u00E9t\u00E9 finale {1} -lutinutil.error.parser.convertor=n''a pas pu convertir {0} dans le type {1} -lutinutil.error.parser.too.less.option.found=L''option {0} doit etre trouv\u00E9e au moins {1} fois, mais fut trouv\u00E9 seuleument {2} fois. -lutinutil.error.parser.unfound.mandatory.argument=Il manque l'argument obligatoire {0} dans le groupe {1}, a trouv\u00E9 \: {2} -lutinutil.error.parser.unfound.mandatory.group=Il manque un argument du groupe obligatoire {0} dans l''option {1} -lutinutil.error.parser.unfound.mandatory.option=Il manque une option obligatoire {0} -lutinutil.error.parser.valued.argument.unfound=n''a pas pu trouver un argument de type value avec la clef {0} dans {1} -lutinutil.error.unfound.config.property=n''a pas pu trouver pour la configuration ''{0}'' la propri\u00E9t\u00E9 {1} +lutinutil.change.config.property=modification pour la configuration %1$s propri\u00E9t\u00E9 %2$s <old\: %3$s, new\: %4$s> +lutinutil.error.config.unauthorized.key=La clef %1$s n''est pas autoris\u00E9, liste des clefs possibles %2$s +lutinutil.error.final.property=Dans la configuration [%1$s], impossible de modifier la propri\u00E9t\u00E9 finale %2$s +lutinutil.error.parser.convertor=n''a pas pu convertir %1$s dans le type %2$s +lutinutil.error.parser.too.less.option.found=L''option %1$s doit etre trouv\u00E9e au moins %2$s fois, mais fut trouv\u00E9 seuleument %3$s fois. +lutinutil.error.parser.unfound.mandatory.argument=Il manque l'argument obligatoire %1$s dans le groupe %2$s, a trouv\u00E9 \: %3$s +lutinutil.error.parser.unfound.mandatory.group=Il manque un argument du groupe obligatoire %1$s dans l''option %2$s +lutinutil.error.parser.unfound.mandatory.option=Il manque une option obligatoire %1$s +lutinutil.error.parser.valued.argument.unfound=n''a pas pu trouver un argument de type value avec la clef %1$s dans %2$s +lutinutil.error.unfound.config.property=n''a pas pu trouver pour la configuration '%1$s' la propri\u00E9t\u00E9 %2$s lutinutil.message.reset.user.configuration=R\u00E9initisation de votre configuration -lutinutil.parser.unavailable.option=L''option {0} n''est pas disponible \u00E0 la position {1} -lutinutil.parser.unavailable.option.argument=L''option {0} n''accepte plus d''arguments, ne peut pas traiter l''argument {1} \u00E0 la position {2} -lutinutil.parser.unknown.option=option inconnue avec la clef {0} \u00E0 la position {1} -lutinutil.parserdef.printError=Des erreurs ou des arguments non utilisables ont \u00E9t\u00E9 d\u00E9tect\u00E9s pendant le parsing de {0} -lutinutil.parserdef.printError.error=\nerreur {0}/{1}\n -lutinutil.parserdef.printError.head=Ont \u00E9t\u00E9(s) d\u00E9tect\u00E9(s) {0} erreur(s) pendant le parsing des d\u00E9finitions -lutinutil.parserdef.printError.unused=\nargument non utilis\u00E9 {0}/{1} \u00E0 la position {2}\n -lutinutil.parserdef.printError.unused.head=Ont \u00E9t\u00E9(s) d\u00E9tect\u00E9(s) {0} argument(s) non utilisable(s) pendant le parsing des d\u00E9finitions -lutinutil.parserdef.printUsage.configs.head=Description d\u00E9taill\u00E9e des configurations de **{0}** -lutinutil.parserdef.printUsage.head=Guide d''utilisation de ''{0}'' +lutinutil.parser.unavailable.option=L''option %1$s n''est pas disponible \u00E0 la position %2$s +lutinutil.parser.unavailable.option.argument=L''option %1$s n''accepte plus d''arguments, ne peut pas traiter l''argument %2$s \u00E0 la position %3$s +lutinutil.parser.unknown.option=option inconnue avec la clef %1$s \u00E0 la position %2$s +lutinutil.parserdef.printError=Des erreurs ou des arguments non utilisables ont \u00E9t\u00E9 d\u00E9tect\u00E9s pendant le parsing de %1$s +lutinutil.parserdef.printError.error=\nerreur %1$s/%2$s\n +lutinutil.parserdef.printError.head=Ont \u00E9t\u00E9(s) d\u00E9tect\u00E9(s) %1$s erreur(s) pendant le parsing des d\u00E9finitions +lutinutil.parserdef.printError.unused=\nargument non utilis\u00E9 %1$s/%2$s \u00E0 la position %3$s\n +lutinutil.parserdef.printError.unused.head=Ont \u00E9t\u00E9(s) d\u00E9tect\u00E9(s) %1$s argument(s) non utilisable(s) pendant le parsing des d\u00E9finitions +lutinutil.parserdef.printUsage.configs.head=Description d\u00E9taill\u00E9e des configurations de **%1$s** +lutinutil.parserdef.printUsage.head=Guide d''utilisation de '%1$s' lutinutil.parserdef.printUsage.options.head=Les commandes de lancement Modified: commandline/trunk/commandline-demo/pom.xml =================================================================== --- commandline/trunk/commandline-demo/pom.xml 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/commandline-demo/pom.xml 2008-11-30 18:50:25 UTC (rev 1262) @@ -42,7 +42,7 @@ </dependency> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> </dependency> @@ -162,42 +162,36 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>${lutinutil.version}</version> + </dependency> + </dependencies> </plugin> - - <!-- Package phase --> - <!--plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - </execution> - </executions> - </plugin--> + </plugin> - <!--plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> <manifest> - <mainClass>${maven.jar.main.class}</mainClass> <addClasspath>true</addClasspath> <addExtensions/> - <classpathPrefix>./dependency/</classpathPrefix> + <classpathPrefix>./lib/</classpathPrefix> </manifest> </archive> </configuration> - </plugin--> + </plugin> </plugins> </build> Modified: commandline/trunk/commandline-demo/run-demo.sh =================================================================== --- commandline/trunk/commandline-demo/run-demo.sh 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/commandline-demo/run-demo.sh 2008-11-30 18:50:25 UTC (rev 1262) @@ -1,7 +1,7 @@ #!/bin/sh DEBUG_PORT=5005 -VERSION=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:version" pom.xml) +VERSION=$(xmlstarlet sel -N "p=http://maven.apache.org/POM/4.0.0" -t -v "/p:project/p:parent/p:version" pom.xml) JAVA=java RELEASE="commandline-demo-$VERSION" MX=128M Modified: commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java =================================================================== --- commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-11-30 18:50:25 UTC (rev 1262) @@ -46,7 +46,7 @@ } public void initI18n() { - I18n.init(getMainConfig().getLocale(), getMainConfig().getEncoding()); + I18n.init(getMainConfig().getLocale()); } public void dispose(boolean reload) { Modified: commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties =================================================================== --- commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-11-30 18:50:25 UTC (rev 1262) @@ -16,9 +16,9 @@ commandline.action.site=Site commandline.action.site.help= commandline.action.site.tooltip=Open in a browser the website of the application -commandline.close_question=Really quit {0} ? +commandline.close_question=Really quit %1$s ? commandline.confirm.changeLanguage= commandline.menu.i18n=Language commandline.no=No -commandline.question=Quit {0} +commandline.question=Quit %1$s commandline.yes=Yes Modified: commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties =================================================================== --- commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-11-30 18:50:25 UTC (rev 1262) @@ -16,9 +16,9 @@ commandline.action.site=Site commandline.action.site.help= commandline.action.site.tooltip=Ouvrir dans un navigateur le site de l'application -commandline.close_question=Voulez-vous quitter {0} ? +commandline.close_question=Voulez-vous quitter %1$s ? commandline.confirm.changeLanguage= commandline.menu.i18n=Langue commandline.no=Non -commandline.question=Quitter {0} +commandline.question=Quitter %1$s commandline.yes=Oui Modified: commandline/trunk/maven-commandline-plugin/pom.xml =================================================================== --- commandline/trunk/maven-commandline-plugin/pom.xml 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/maven-commandline-plugin/pom.xml 2008-11-30 18:50:25 UTC (rev 1262) @@ -17,7 +17,6 @@ <groupId>org.codelutin.commandline</groupId> <artifactId>maven-commandline-plugin</artifactId> - <name>maven-plugin</name> <dependencies> <dependency> @@ -51,6 +50,8 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> + <name>maven-commandline-plugin</name> + <description> Plugin maven 2 pour la generation du parser d'options, des configurations et du context d'application en se basant sur @@ -86,6 +87,17 @@ </plugins> </build> + <reports> + <plugins> + + <!--Site report's plugin--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + + </plugins> + </reports> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> Modified: commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java =================================================================== --- commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java 2008-11-30 18:50:25 UTC (rev 1262) @@ -235,6 +235,8 @@ map.put(context.getKey(), optionClassName); } + boolean hasConfig = getContext().getConfigContexts().length>0; + // generate specialized abstract OptionAction for this parser if (needSpecializedAction()) { @@ -248,7 +250,7 @@ getContext().setConfigSimpleName(getContext().getPrefix() + (isConcreteConfig ? "" : "Abstract") + "Config"); // generate specialized abstract SimpleConfigImpl for this parser - if (needSpecializedAbstractConfig()) { + if (hasConfig && needSpecializedAbstractConfig()) { AbstractConfigJavaGenerator.doGenerate(getContext(), getPrefix() + "AbstractConfig"); // the super classes of generatred configs is the one generated here @@ -290,7 +292,7 @@ } map.clear(); - // generate ConcreteContext serivce declaration + // generate ConcreteContext service declaration generateConcreteContextDeclaration(); } 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 16:25:11 UTC (rev 1261) +++ commandline/trunk/maven-commandline-plugin/src/main/java/org/codelutin/option/generate/RstGeneratorGoal.java 2008-11-30 18:50:25 UTC (rev 1262) @@ -122,7 +122,7 @@ private void generateForBundle(Writer w, File rstFilePath, String prefix, List<OptionKey> optionKeys, List<ConfigKey> configKeys, Locale locale) throws IOException { // init i18n with this locale - I18n.init(locale, getEncoding()); + I18n.init(locale); toString(w, _("commandline.generateRstFile.head", prefix), 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 16:25:11 UTC (rev 1261) +++ commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-en_GB.properties 2008-11-30 18:50:25 UTC (rev 1262) @@ -1,52 +1,53 @@ +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.generateRstFile.head=**{0}**''s usage -commandline.generateRstFile.info=[generateRstFile] {0} +commandline.generateRstFile.head=**%1$s**'s usage +commandline.generateRstFile.info=[generateRstFile] %1$s commandline.generateRstFile.options.head=Launch commands commandline.generateRstFile.prefix=\n\#. -commandline.parser.parsing.error=parser {0} detects {1} error(s) -commandline.parser.result.info=[parseDefinition] parser {0} scanned {1} valid option(s) and {2} valid config(s) +commandline.parser.parsing.error=parser %1$s detects %2$s error(s) +commandline.parser.result.info=[parseDefinition] parser %1$s scanned %2$s valid option(s) and %3$s valid config(s) commandline.showErrors.info=[showErrors] commandline.showErrors.no.error.info=[showErrors] no error found -lutinutil.error.parserdef.config.convert.defaultValue=could not convert default value {0} of type {1} for property {2} in config {3} -lutinutil.error.parserdef.config.convert.unfound=could not found a converter for type {0} for property {1} in config {2} -lutinutil.error.parserdef.config.duplicated.category=duplicated configuration category found {0} (known categories {1}) -lutinutil.error.parserdef.config.duplicated.property.key=duplicated property key {0} for config {1} (found keys \: {2}) -lutinutil.error.parserdef.config.duplicated.property.modifier=duplicated modifier {0} for property {1} in config {2} \: (modifier(s) found \: {3}) -lutinutil.error.parserdef.config.orphan.modifier=find a modifiers entry {0}, with no definition corresponding, config {1} (allowed keys \:{2}) -lutinutil.error.parserdef.config.type.unfound=could not found the type {0} for property {1} in config {2} -lutinutil.error.parserdef.config.unvalid.syntax.category=find a non syntax valid config category {0} -lutinutil.error.parserdef.config.unvalid.syntax.property.definition=find a non syntax valid definition {0} for property {1} in config {2} -lutinutil.error.parserdef.config.unvalid.syntax.property.key=find a non syntax valid config property key {0} -lutinutil.parserdef.argument.mandatory.cardinalite=A mandatory option''s argument must have at least a 1,1 cardinalite, but was here {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.argument.optional.cardinalite=A optional option''s argument must have at least a 0,* cardinalite, but was here {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.const.argument.mandatory.cardinalite=A ''constant'' mandatory option''s argument must have a 1,1 cardinalite, but was here {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.const.argument.optional.cardinalite=A ''constant'' optional option''s argument must have a 0,1 cardinalite, but was here {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.duplicated.argument.key=argument key {0} was allready registered in this group (argumentdef\: {1}) (groupDef\: {2}) -lutinutil.parserdef.duplicated.argument.valued.type=valued type {0} was allready registered for this group (argumentdef\: {1}) (groupDef\: {2}) -lutinutil.parserdef.duplicated.option.alias=duplicated alias found {0} found [definition\:{1}, previousDefinition \:{2}] -lutinutil.parserdef.duplicated.option.name=duplicated option name {0} found [definition\:{1}, previousDefinition\:{2}] -lutinutil.parserdef.file.and.newfile.in.same.group=you can not use in a same group a file and newfile ValuedOptionArgument, but you did for '{0}' in '{1}'. -lutinutil.parserdef.float.and.integer.in.same.group=you can not use in a same group a float and integer ValuedOptionArgument, but you did for '{0}' in '{1}'. -lutinutil.parserdef.max.can.not.be.zero=the max can not be zero but was {0} (definition\: {1}) -lutinutil.parserdef.max.lowest.than.min=repetition max can not be lesser than repetition min (excetp for -1) but was max {0} min {1} found (definition\:{2}) -lutinutil.parserdef.max.too.low=the max can not under -1 but was {0} (definition\: {1}) -lutinutil.parserdef.min.can.not.be.negative=the min can not be negative but was {0} (definition\: {1}) +lutinutil.error.parserdef.config.convert.defaultValue=could not convert default value %1$s of type %2$s for property %3$s in config %4$s +lutinutil.error.parserdef.config.convert.unfound=could not found a converter for type %1$s for property %2$s in config %3$s +lutinutil.error.parserdef.config.duplicated.category=duplicated configuration category found %1$s (known categories %2$s) +lutinutil.error.parserdef.config.duplicated.property.key=duplicated property key %1$s for config %2$s (found keys \: %3$s) +lutinutil.error.parserdef.config.duplicated.property.modifier=duplicated modifier %1$s for property %2$s in config %3$s \: (modifier(s) found \: %4$s) +lutinutil.error.parserdef.config.orphan.modifier=find a modifiers entry %1$s, with no definition corresponding, config %2$s (allowed keys \:%3$s) +lutinutil.error.parserdef.config.type.unfound=could not found the type %1$s for property %2$s in config %3$s +lutinutil.error.parserdef.config.unvalid.syntax.category=find a non syntax valid config category %1$s +lutinutil.error.parserdef.config.unvalid.syntax.property.definition=find a non syntax valid definition %1$s for property %2$s in config %3$s +lutinutil.error.parserdef.config.unvalid.syntax.property.key=find a non syntax valid config property key %1$s +lutinutil.parserdef.argument.mandatory.cardinalite=A mandatory option's argument must have at least a 1,1 cardinalite, but was here %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.argument.optional.cardinalite=A optional option's argument must have at least a 0,* cardinalite, but was here %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.const.argument.mandatory.cardinalite=A 'constant' mandatory option's argument must have a 1,1 cardinalite, but was here %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.const.argument.optional.cardinalite=A 'constant' optional option's argument must have a 0,1 cardinalite, but was here %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.duplicated.argument.key=argument key %1$s was allready registered in this group (argumentdef\: %2$s) (groupDef\: %3$s) +lutinutil.parserdef.duplicated.argument.valued.type=valued type %1$s was allready registered for this group (argumentdef\: %2$s) (groupDef\: %3$s) +lutinutil.parserdef.duplicated.option.alias=duplicated alias found %1$s found [definition\:%2$s, previousDefinition \:%3$s] +lutinutil.parserdef.duplicated.option.name=duplicated option name %1$s found [definition\:%2$s, previousDefinition\:%3$s] +lutinutil.parserdef.file.and.newfile.in.same.group=you can not use in a same group a file and newfile ValuedOptionArgument, but you did for '%1$s' in '%2$s'. +lutinutil.parserdef.float.and.integer.in.same.group=you can not use in a same group a float and integer ValuedOptionArgument, but you did for '%1$s' in '%2$s'. +lutinutil.parserdef.max.can.not.be.zero=the max can not be zero but was %1$s (definition\: %2$s) +lutinutil.parserdef.max.lowest.than.min=repetition max can not be lesser than repetition min (excetp for -1) but was max %1$s min %2$s found (definition\:%3$s) +lutinutil.parserdef.max.too.low=the max can not under -1 but was %1$s (definition\: %2$s) +lutinutil.parserdef.min.can.not.be.negative=the min can not be negative but was %1$s (definition\: %2$s) lutinutil.parserdef.null.source=null source for parser -lutinutil.parserdef.null.sourceType=null source type for parser, known types\: {0} -lutinutil.parserdef.printError.error=\nerror {0}/{1}\n -lutinutil.parserdef.printError.head=Found {0} error(s) while parsing definitions -lutinutil.parserdef.string.and.newfile.in.same.group=you can not use in a same group a string and newfile ValuedOptionArgument, but you did for '{0}' in '{1}'. -lutinutil.parserdef.too.much.alias.option=too much alias found {0} \: maximum 4 alias [definition\:{1}] -lutinutil.parserdef.unfound.key=could not found a key for {0} in {1} +lutinutil.parserdef.null.sourceType=null source type for parser, known types\: %1$s +lutinutil.parserdef.printError.error=\nerror %1$s/%2$s\n +lutinutil.parserdef.printError.head=Found %1$s error(s) while parsing definitions +lutinutil.parserdef.string.and.newfile.in.same.group=you can not use in a same group a string and newfile ValuedOptionArgument, but you did for '%1$s' in '%2$s'. +lutinutil.parserdef.too.much.alias.option=too much alias found %1$s \: maximum 4 alias [definition\:%2$s] +lutinutil.parserdef.unfound.key=could not found a key for %1$s in %2$s lutinutil.parserdef.unfound.source=lutinutil.parserdef.unfound.source -lutinutil.parserdef.unvalid.syntax.alias.option=unvalid alias found {0} \: alias must begin by '-' caractere [definition\:{1}] -lutinutil.parserdef.unvalid.syntax.caret.option=there is an unmatch [ or ] in option's definition [definition {0}] -lutinutil.parserdef.unvalid.syntax.empty.option.definition=definition of an option can not be empty nor null [definition\:{0}] -lutinutil.parserdef.unvalid.syntax.lesser.option=there is an unmatch < or > in option''s definition [definition {0}] -lutinutil.parserdef.unvalid.syntax.underbrace.option=there is an unmatch brace in option''s definition [definition {0}] -lutinutil.parserdef.unvalid.syntax.unfound.alias.in.option=unfound alias in a option''s definition must contains at least one alias prefixed by - caractere [definition {0}] -lutinutil.parserdef.unvalid.syntax.unknown.argument.type=unknown argument type for {0} in {1} -lutinutil.parserdef.unvalid.syntax.unknown.group.of.arguments=unknown group of arguments \: {0} -lutinutil.parserdef.unvalid.syntax.unknown.modifier=unknown config property modifier ''{0}'' -lutinutil.parserdef.unvalid.syntax.unknown.value.type=unknown value type for {0} in {1} +lutinutil.parserdef.unvalid.syntax.alias.option=unvalid alias found %1$s \: alias must begin by '-' caractere [definition\:%2$s] +lutinutil.parserdef.unvalid.syntax.caret.option=there is an unmatch [ or ] in option's definition [definition %1$s] +lutinutil.parserdef.unvalid.syntax.empty.option.definition=definition of an option can not be empty nor null [definition\:%1$s] +lutinutil.parserdef.unvalid.syntax.lesser.option=there is an unmatch < or > in option's definition [definition %1$s] +lutinutil.parserdef.unvalid.syntax.underbrace.option=there is an unmatch brace in option's definition [definition %1$s] +lutinutil.parserdef.unvalid.syntax.unfound.alias.in.option=unfound alias in a option's definition must contains at least one alias prefixed by - caractere [definition %1$s] +lutinutil.parserdef.unvalid.syntax.unknown.argument.type=unknown argument type for %1$s in %2$s +lutinutil.parserdef.unvalid.syntax.unknown.group.of.arguments=unknown group of arguments \: %1$s +lutinutil.parserdef.unvalid.syntax.unknown.modifier=unknown config property modifier '%1$s' +lutinutil.parserdef.unvalid.syntax.unknown.value.type=unknown value type for %1$s in %2$s 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 16:25:11 UTC (rev 1261) +++ commandline/trunk/maven-commandline-plugin/src/main/resources/i18n/maven-commandline-plugin-fr_FR.properties 2008-11-30 18:50:25 UTC (rev 1262) @@ -1,52 +1,53 @@ +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.generateRstFile.configs.head=Les configurations de **{0}** -commandline.generateRstFile.head=Guide d''utilisation de **{0}** -commandline.generateRstFile.info=[generateRstFile] {0} -commandline.generateRstFile.options.head=Les commandes de lancement de **{0}** +commandline.generateRstFile.configs.head=Les configurations de **%1$s** +commandline.generateRstFile.head=Guide d'utilisation de **%1$s** +commandline.generateRstFile.info=[generateRstFile] %1$s +commandline.generateRstFile.options.head=Les commandes de lancement de **%1$s** commandline.generateRstFile.prefix=\n\#. -commandline.parser.parsing.error=Le parseur {0} a detecte {1} erreur(s) -commandline.parser.result.info=[parseDefinition] Le parseur {0} a scann\u00E9 {1} option(s) valide(s) et {2} configuration(s) valide(s) +commandline.parser.parsing.error=Le parseur %1$s a detecte %2$s erreur(s) +commandline.parser.result.info=[parseDefinition] Le parseur %1$s a scann\u00E9 %2$s option(s) valide(s) et %3$s configuration(s) valide(s) commandline.showErrors.info=[showErrors] commandline.showErrors.no.error.info=[showErrors] aucune erreur detectee. -lutinutil.error.parserdef.config.convert.defaultValue=n''a pas pu convertir la valeur par d\u00E9faut {0} de type {1} pour la propri\u00E9t\u00E9 {2} de la config {3} -lutinutil.error.parserdef.config.convert.unfound=Converter non trouv\u00E9 pour le type {0} pour la propri\u00E9t\u00E9 {1} de la config {2} -lutinutil.error.parserdef.config.duplicated.category=Cat\u00E9gorie de configuration dupliqu\u00E9 {0} trouv\u00E9e (cat\u00E9gories connues {1}) -lutinutil.error.parserdef.config.duplicated.property.key=Clef de propri\u00E9t\u00E9 dupliqu\u00E9 trouv\u00E9 {0} pour la config {1} (clefs trouv\u00E9e(s) \: {2}) -lutinutil.error.parserdef.config.duplicated.property.modifier=Modifier dupliqu\u00E9 {0} pour la propri\u00E9t\u00E9 {1} de la config {2} (modifiers trouv\u00E9(s) \: {3}) -lutinutil.error.parserdef.config.orphan.modifier=Modifier trouv\u00E9 {0} sans d\u00E9finition de propri\u00E9t\u00E9 pour la config {1} (clefs autoris\u00E9e(s) \:{2}) -lutinutil.error.parserdef.config.type.unfound=Type {0} non trouv\u00E9 pour la propri\u00E9t\u00E9 {1} de la config {2} -lutinutil.error.parserdef.config.unvalid.syntax.category=Cat\u00E9gorie de config non valide syntaxiquement {0} -lutinutil.error.parserdef.config.unvalid.syntax.property.definition=D\u00E9finition non valide syntaxiquement {0} pour la propri\u00E9t\u00E9 {1} de la config {2} -lutinutil.error.parserdef.config.unvalid.syntax.property.key=Clef de propri\u00E9t\u00E9 de config non valide syntaxiquement {0} pour la config {1} -lutinutil.parserdef.argument.mandatory.cardinalite=Un argument d''option obligatoire est obligatoire (cardinalite minimum 1,+), mais vaut ici {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.argument.optional.cardinalite=Un argument d''option facultatif est facultatif (cardinalite minimum 0,*), mais vaut ici {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.const.argument.mandatory.cardinalite=Un argument d''option obligatoire de type constant ne peut pas avoir d''autre cardinalite que 1,1, mais vaut ici {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.const.argument.optional.cardinalite=Un argument d''option facultatif de type constant ne peut pas avoir d''autre cardinalite que 0,1, mais vaut ici {0},{1}, (definition\: {2}, ''{3}'') -lutinutil.parserdef.duplicated.argument.key=clef d''argument duplique d\u00E9tect\u00E9 ''{0}'' dans une groupement d''arguments (argumentdef\: {1}) (groupDef\: {2}) -lutinutil.parserdef.duplicated.argument.valued.type=type de valeur d'argument d\u00E9tect\u00E9 {0} dans un groupement d'argument (argumentdef\: {1}) (groupDef\: {2}) -lutinutil.parserdef.duplicated.option.alias=alias duplique d\u00E9tect\u00E9 {0} [definition\:{1}, definition de conflit \:{2}] -lutinutil.parserdef.duplicated.option.name=nom d'option dupliquee d\u00E9tect\u00E9 {0} [definition\:{1}, definition de conflit\:{2}] -lutinutil.parserdef.file.and.newfile.in.same.group=le type file et newfile ne peuvent pas etre utilises simultannement dans un meme groupe pour le type Valued, utilisation du type interdite '{0}' in '{1}'. -lutinutil.parserdef.float.and.integer.in.same.group=le type float et integer ne peuvent pas etre utilises simultannement dans un meme groupe pour le type Valued, utilisation du type interdite '{0}' in '{1}'. -lutinutil.parserdef.max.can.not.be.zero=le max ne peut pas valoir 0, mais vaut ici {0} (definition\: {1}) -lutinutil.parserdef.max.lowest.than.min=la repetition max ne peut pas etre superieure a repetition min (sauf pour la valeur speciale -1) mais vaut ici max {0} min {1} (definition\: {2}) -lutinutil.parserdef.max.too.low=le max ne peut pas etre inferieure a -1, mais vaut ici {0} (definition\: {1}) -lutinutil.parserdef.min.can.not.be.negative=le min ne peut pas etre negatif, mais vaut ici {0} (definition\: {1}) +lutinutil.error.parserdef.config.convert.defaultValue=n'a pas pu convertir la valeur par d\u00E9faut %1$s de type %2$s pour la propri\u00E9t\u00E9 %3$s de la config %4$s +lutinutil.error.parserdef.config.convert.unfound=Converter non trouv\u00E9 pour le type %1$s pour la propri\u00E9t\u00E9 %2$s de la config %3$s +lutinutil.error.parserdef.config.duplicated.category=Cat\u00E9gorie de configuration dupliqu\u00E9 %1$s trouv\u00E9e (cat\u00E9gories connues %2$s) +lutinutil.error.parserdef.config.duplicated.property.key=Clef de propri\u00E9t\u00E9 dupliqu\u00E9 trouv\u00E9 %1$s pour la config %2$s (clefs trouv\u00E9e(s) \: %3$s) +lutinutil.error.parserdef.config.duplicated.property.modifier=Modifier dupliqu\u00E9 %1$s pour la propri\u00E9t\u00E9 %2$s de la config %3$s (modifiers trouv\u00E9(s) \: %4$s) +lutinutil.error.parserdef.config.orphan.modifier=Modifier trouv\u00E9 %1$s sans d\u00E9finition de propri\u00E9t\u00E9 pour la config %2$s (clefs autoris\u00E9e(s) \:%3$s) +lutinutil.error.parserdef.config.type.unfound=Type %1$s non trouv\u00E9 pour la propri\u00E9t\u00E9 %2$s de la config %3$s +lutinutil.error.parserdef.config.unvalid.syntax.category=Cat\u00E9gorie de config non valide syntaxiquement %1$s +lutinutil.error.parserdef.config.unvalid.syntax.property.definition=D\u00E9finition non valide syntaxiquement %1$s pour la propri\u00E9t\u00E9 %2$s de la config %3$s +lutinutil.error.parserdef.config.unvalid.syntax.property.key=Clef de propri\u00E9t\u00E9 de config non valide syntaxiquement %1$s pour la config %2$s +lutinutil.parserdef.argument.mandatory.cardinalite=Un argument d'option obligatoire est obligatoire (cardinalite minimum 1,+), mais vaut ici %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.argument.optional.cardinalite=Un argument d'option facultatif est facultatif (cardinalite minimum 0,*), mais vaut ici %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.const.argument.mandatory.cardinalite=Un argument d'option obligatoire de type constant ne peut pas avoir d'autre cardinalite que 1,1, mais vaut ici %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.const.argument.optional.cardinalite=Un argument d'option facultatif de type constant ne peut pas avoir d'autre cardinalite que 0,1, mais vaut ici %1$s,%2$s, (definition\: %3$s, '%4$s') +lutinutil.parserdef.duplicated.argument.key=clef d'argument duplique d\u00E9tect\u00E9 '%1$s' dans une groupement d'arguments (argumentdef\: %2$s) (groupDef\: %3$s) +lutinutil.parserdef.duplicated.argument.valued.type=type de valeur d'argument d\u00E9tect\u00E9 %1$s dans un groupement d'argument (argumentdef\: %2$s) (groupDef\: %3$s) +lutinutil.parserdef.duplicated.option.alias=alias duplique d\u00E9tect\u00E9 %1$s [definition\:%2$s, definition de conflit \:%3$s] +lutinutil.parserdef.duplicated.option.name=nom d'option dupliquee d\u00E9tect\u00E9 %1$s [definition\:%2$s, definition de conflit\:%3$s] +lutinutil.parserdef.file.and.newfile.in.same.group=le type file et newfile ne peuvent pas etre utilises simultannement dans un meme groupe pour le type Valued, utilisation du type interdite '%1$s' in '%2$s'. +lutinutil.parserdef.float.and.integer.in.same.group=le type float et integer ne peuvent pas etre utilises simultannement dans un meme groupe pour le type Valued, utilisation du type interdite '%1$s' in '%2$s'. +lutinutil.parserdef.max.can.not.be.zero=le max ne peut pas valoir 0, mais vaut ici %1$s (definition\: %2$s) +lutinutil.parserdef.max.lowest.than.min=la repetition max ne peut pas etre superieure a repetition min (sauf pour la valeur speciale -1) mais vaut ici max %1$s min %2$s (definition\: %3$s) +lutinutil.parserdef.max.too.low=le max ne peut pas etre inferieure a -1, mais vaut ici %1$s (definition\: %2$s) +lutinutil.parserdef.min.can.not.be.negative=le min ne peut pas etre negatif, mais vaut ici %1$s (definition\: %2$s) lutinutil.parserdef.null.source=source nulle pour le parseur -lutinutil.parserdef.null.sourceType=type de source nulle pour le parseur, types connus \: {0} -lutinutil.parserdef.printError.error=\nerreur {0}/{1}\n -lutinutil.parserdef.printError.head=Ont \u00E9t\u00E9(s) d\u00E9tect\u00E9(s) {0} erreur(s) pendant le parsing des d\u00E9finitions -lutinutil.parserdef.string.and.newfile.in.same.group=le type string et newfile ne peuvent pas etre utilises simultannement dans un meme groupe pour le type Valued, utilisation du type interdite '{0}' in '{1}'. -lutinutil.parserdef.too.much.alias.option=trop d''alias definit pour cette option {0} \: maximum 4 [definition\:{1}] -lutinutil.parserdef.unfound.key=clef non d\u00E9tect\u00E9e pour {0} dans la definition {1} +lutinutil.parserdef.null.sourceType=type de source nulle pour le parseur, types connus \: %1$s +lutinutil.parserdef.printError.error=\nerreur %1$s/%2$s\n +lutinutil.parserdef.printError.head=Ont \u00E9t\u00E9(s) d\u00E9tect\u00E9(s) %1$s erreur(s) pendant le parsing des d\u00E9finitions +lutinutil.parserdef.string.and.newfile.in.same.group=le type string et newfile ne peuvent pas etre utilises simultannement dans un meme groupe pour le type Valued, utilisation du type interdite '%1$s' in '%2$s'. +lutinutil.parserdef.too.much.alias.option=trop d'alias definit pour cette option %1$s \: maximum 4 [definition\:%2$s] +lutinutil.parserdef.unfound.key=clef non d\u00E9tect\u00E9e pour %1$s dans la definition %2$s lutinutil.parserdef.unfound.source=lutinutil.parserdef.unfound.source -lutinutil.parserdef.unvalid.syntax.alias.option=alias invalide d\u00E9tect\u00E9 {0} \: un alias doit toujours commencer par un caractere '-' [definition\:{1}] -lutinutil.parserdef.unvalid.syntax.caret.option=il y a un [ ou ] manquant dans la definition de l''option [definition {0}, description {1}] -lutinutil.parserdef.unvalid.syntax.empty.option.definition=la definition d''une option ne peut etre null ou vide [definition\:{0}] -lutinutil.parserdef.unvalid.syntax.lesser.option=il y a un < ou > manquant dans la definition de l''option [definition {0}] -lutinutil.parserdef.unvalid.syntax.underbrace.option=il y a un guillemet manquant dans la definition de l''option [definition {0}] -lutinutil.parserdef.unvalid.syntax.unfound.alias.in.option=la definition d''une option doit comprendre au moins un alias[definition {0}] -lutinutil.parserdef.unvalid.syntax.unknown.argument.type=type d''argument inconnu d\u00E9tect\u00E9 {0} dans la definition {1} -lutinutil.parserdef.unvalid.syntax.unknown.group.of.arguments=groupement d''argument de type inconnu \: {0} -lutinutil.parserdef.unvalid.syntax.unknown.modifier=unknown config property modifier ''{0}'' -lutinutil.parserdef.unvalid.syntax.unknown.value.type=type de valeur d''argument inconnu d\u00E9tect\u00E9 {0} dans la definition {1} +lutinutil.parserdef.unvalid.syntax.alias.option=alias invalide d\u00E9tect\u00E9 %1$s \: un alias doit toujours commencer par un caractere '-' [definition\:%2$s] +lutinutil.parserdef.unvalid.syntax.caret.option=il y a un [ ou ] manquant dans la definition de l'option [definition %1$s, description %2$s] +lutinutil.parserdef.unvalid.syntax.empty.option.definition=la definition d'une option ne peut etre null ou vide [definition\:%1$s] +lutinutil.parserdef.unvalid.syntax.lesser.option=il y a un < ou > manquant dans la definition de l'option [definition %1$s] +lutinutil.parserdef.unvalid.syntax.underbrace.option=il y a un guillemet manquant dans la definition de l'option [definition %1$s] +lutinutil.parserdef.unvalid.syntax.unfound.alias.in.option=la definition d'une option doit comprendre au moins un alias[definition %1$s] +lutinutil.parserdef.unvalid.syntax.unknown.argument.type=type d'argument inconnu d\u00E9tect\u00E9 %1$s dans la definition %2$s +lutinutil.parserdef.unvalid.syntax.unknown.group.of.arguments=groupement d'argument de type inconnu \: %1$s +lutinutil.parserdef.unvalid.syntax.unknown.modifier=unknown config property modifier '%1$s' +lutinutil.parserdef.unvalid.syntax.unknown.value.type=type de valeur d'argument inconnu d\u00E9tect\u00E9 %1$s dans la definition %2$s Modified: commandline/trunk/maven-commandline-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java =================================================================== --- commandline/trunk/maven-commandline-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/maven-commandline-plugin/src/test/java/org/codelutin/option/generate/GenerateJavaTest.java 2008-11-30 18:50:25 UTC (rev 1262) @@ -24,6 +24,7 @@ import org.codelutin.option.Option; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionParser; +import org.codelutin.option.AbstractContext; import org.codelutin.option.def.DefaultOptionAction; import org.codelutin.option.def.DefinitionParserFromProperties; import org.codelutin.option.def.ParserUtilForTest; @@ -54,10 +55,8 @@ public static void beforeClass() { I18n.init(); basedir = ParserUtilForTest.getBaseDir(); - OUT_PATH = new File(basedir, "target" + File.separator + "generated-sources" + File.separator + "java").getAbsolutePath(); } - @Before public void beforeTest() throws Exception { DefaultOptionAction.skipDefault = true; @@ -66,6 +65,8 @@ @Test public void testGenerate() throws Exception { + OUT_PATH = new File(basedir, "target" + File.separator + "generated-sources" + File.separator + "testGenerate-java").getAbsolutePath(); + goal.setPrefix("Test"); goal.setVerbose(false); goal.setSource(new File(basedir, "src" + File.separator + "test" + File.separator + "resources" + File.separator + "testOptions.properties")); @@ -75,17 +76,19 @@ goal.setParserSuperClass(OptionParser.class.getName()); goal.setOptionSuperClass(Option.class.getName()); goal.setActionSuperClass(OptionAction.class.getName()); + goal.setContextSuperClass(AbstractContext.class.getName()); goal.setConfigSuperClass(Config.class.getName()); goal.setOut(new File(OUT_PATH)); goal.setOutResource(new File(OUT_PATH)); goal.setParserFQN(DefinitionParserFromProperties.class.getName()); - goal.setConcreteContextFQN("org.codelutin.commandline.test.Context"); + goal.setConcreteContextFQN("org.codelutin.commandline.test.Context"); goal.setShowErrors(true); goal.execute(); } @Test public void testGenerate2() throws Exception { + OUT_PATH = new File(basedir, "target" + File.separator + "generated-sources" + File.separator + "testGenerate2-java").getAbsolutePath(); goal.setPrefix("Test2"); goal.setVerbose(false); @@ -96,6 +99,7 @@ goal.setOptionSuperClass(Option.class.getName()); goal.setActionSuperClass(OptionAction.class.getName()); goal.setConfigSuperClass(Config.class.getName()); + goal.setContextSuperClass(AbstractContext.class.getName()); goal.setOut(new File(OUT_PATH)); goal.setOutResource(new File(OUT_PATH)); goal.setParserFQN(DefinitionParserFromProperties.class.getName()); Modified: commandline/trunk/pom.xml =================================================================== --- commandline/trunk/pom.xml 2008-11-30 16:25:11 UTC (rev 1261) +++ commandline/trunk/pom.xml 2008-11-30 18:50:25 UTC (rev 1262) @@ -37,7 +37,7 @@ <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>pom</name> + <name>commandline</name> <description>lutincommandline library main pom</description> <inceptionYear>2008</inceptionYear> @@ -64,7 +64,7 @@ </executions> <dependencies> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> <version>${lutinwidget.version}</version> </dependency> @@ -83,9 +83,14 @@ <current.version>1.0-SNAPSHOT</current.version> <!-- jaxx version --> - <jaxx.version>0.5-SNAPSHOT</jaxx.version> + <jaxx.version>0.7-SNAPSHOT</jaxx.version> - <lutinwidget.version>0.10-SNAPSHOT</lutinwidget.version> + <!-- lutinwidget version --> + <lutinwidget.version>0.10</lutinwidget.version> + + <!-- lutinutil version --> + <lutinutil.version>1.0-SNAPSHOT</lutinutil.version> + <!-- id du projet du labs --> <labs.id>12</labs.id> @@ -122,11 +127,11 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.31</version> + <version>${lutinutil.version}</version> </dependency> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> <version>${lutinwidget.version}</version> </dependency>
participants (1)
-
chemit@users.labs.libre-entreprise.org