Author: tchemit Date: 2008-07-08 15:13:29 +0000 (Tue, 08 Jul 2008) New Revision: 837 Added: trunk/commandline/maven/src/main/java/org/ trunk/commandline/maven/src/main/resources/META-INF/ trunk/commandline/maven/src/main/resources/i18n/ trunk/commandline/maven/src/main/resources/log4j.properties trunk/commandline/maven/src/test/java/org/ trunk/commandline/maven/src/test/resources/PropertiesLoaderTest.properties trunk/commandline/maven/src/test/resources/log4j.properties trunk/commandline/maven/src/test/resources/testOptions.properties trunk/commandline/maven/src/test/resources/testOptions2.properties Removed: trunk/maven-commandline-plugin/src/java/org/ trunk/maven-commandline-plugin/src/resources/META-INF/ trunk/maven-commandline-plugin/src/resources/i18n/ trunk/maven-commandline-plugin/src/resources/log4j.properties trunk/maven-commandline-plugin/src/test/PropertiesLoaderTest.properties trunk/maven-commandline-plugin/src/test/log4j.properties trunk/maven-commandline-plugin/src/test/org/ trunk/maven-commandline-plugin/src/test/testOptions.properties trunk/maven-commandline-plugin/src/test/testOptions2.properties Log: Copied: trunk/commandline/maven/src/main/java/org (from rev 821, trunk/maven-commandline-plugin/src/java/org) Copied: trunk/commandline/maven/src/main/resources/META-INF (from rev 821, trunk/maven-commandline-plugin/src/resources/META-INF) Copied: trunk/commandline/maven/src/main/resources/i18n (from rev 821, trunk/maven-commandline-plugin/src/resources/i18n) Copied: trunk/commandline/maven/src/main/resources/log4j.properties (from rev 821, trunk/maven-commandline-plugin/src/resources/log4j.properties) =================================================================== --- trunk/commandline/maven/src/main/resources/log4j.properties (rev 0) +++ trunk/commandline/maven/src/main/resources/log4j.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -0,0 +1,9 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.codelutin=INFO Property changes on: trunk/commandline/maven/src/main/resources/log4j.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/commandline/maven/src/test/java/org (from rev 821, trunk/maven-commandline-plugin/src/test/org) Copied: trunk/commandline/maven/src/test/resources/PropertiesLoaderTest.properties (from rev 821, trunk/maven-commandline-plugin/src/test/PropertiesLoaderTest.properties) =================================================================== --- trunk/commandline/maven/src/test/resources/PropertiesLoaderTest.properties (rev 0) +++ trunk/commandline/maven/src/test/resources/PropertiesLoaderTest.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -0,0 +1,44 @@ +# pour tester une option sans argument +option0.option.definition=--option0|-0 + +# pour tester une option avec 1 argument constant +option1.option.definition=--option1|-1 <constant|constant2|constant3|constant4> + +# pour tester une option avec 1 argument valu� (avec un string) +option2.option.definition=--option2|-2 <string:String|float:Float|file:File|class:class> + +# pour tester une option avec 1 argument valu� (avec un newfile) +option3.option.definition=--option3|-3 <integer:integer|file:File|newfile:NewFile|class:class> + +# pour tester une option avec 1 argument nomm� et valu� +option4.option.definition=--option4|-4 <string=String|integer=Integer|float=Float|file=File|file=NewFile|class=Class> + +# pour tester la nom prise encompte de cette option (option generique) +help.option.definition=--help|-h2 + +main2.config.definition.version2=org.codelutin.util.VersionNumber:3.1.2 +main2.config.modifiers.version2=final,static,mandatory + +main2.config.definition.configFileName2=java.io.File:.isis-config-3 +main2.config.modifiers.configFileName2=final,mandatory,transient + +main2.config.definition.encoding2=java.lang.String:ISO-8859-1 +main2.config.modifiers.encoding2=final,static,mandatory + +main2.config.definition.locale2=java.util.Locale:fr_FR +main2.config.modifiers.locale2=mandatory + +main2.config.definition.projectName2=java.lang.String:Isis-Fish +main2.config.modifiers.projectName2=final,static,mandatory + +main.config.definition.encoding=java.lang.String:ISO-8859-1 +main.config.modifiers.encoding=final,static,mandatory + +main.config.definition.locale=java.util.Locale:fr_FR +main.config.modifiers.locale=mandatory + +main.config.definition.version2=org.codelutin.util.VersionNumber:3.1.2 +main.config.modifiers.version2=final,static,mandatory + +main.config.definition.version3=org.codelutin.util.VersionNumber:3.1.2 +main.config.modifiers.version3=final,static,mandatory \ No newline at end of file Property changes on: trunk/commandline/maven/src/test/resources/PropertiesLoaderTest.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/commandline/maven/src/test/resources/log4j.properties (from rev 821, trunk/maven-commandline-plugin/src/test/log4j.properties) =================================================================== --- trunk/commandline/maven/src/test/resources/log4j.properties (rev 0) +++ trunk/commandline/maven/src/test/resources/log4j.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -0,0 +1,12 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X +# package level +log4j.logger.org.codelutin.commandline=INFO +log4j.logger.org.codelutin.i18n=INFO +log4j.logger.org.codelutin.util=INFO +log4j.logger.org.codelutin.option=INFO Property changes on: trunk/commandline/maven/src/test/resources/log4j.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/commandline/maven/src/test/resources/testOptions.properties (from rev 821, trunk/maven-commandline-plugin/src/test/testOptions.properties) =================================================================== --- trunk/commandline/maven/src/test/resources/testOptions.properties (rev 0) +++ trunk/commandline/maven/src/test/resources/testOptions.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -0,0 +1,18 @@ +option00.option.definition=--option00|-0 +option00.option.description=description option00 + +option01.option.definition=--option01|-1 + <constant|string:String{2}|integer=Integer|float:Float|file:File> +option01.option.description=description option01 + +option02.option.definition=--option02|-2 * <constant|string:String|integer=Integer|float:Float|file:File> [constant1|string1:String|integer1=Integer|float1:Float|file1:File] +option02.option.description=description option02 + +option03.option.definition=--option03|-3 {0,1} <constant|string:String|integer=Integer|float:Float+|file:File> <constant1|string1:String|integer1=Integer|float1:Float|file1:File> +option03.option.description=description option03 + +option04.option.definition=--option04|-4 {1} <constant|string:String+|integer=Integer{4}|float:Float|file:File> <constant1|string1:String|integer1=Integer|float1:Float|file1:File> [constant2|string2:String|integer2=Integer|float2:Float|file2:File] +option04.option.description=d\u00e9scription option04 + +option05.option.definition=--option05|-5 {5,*} <constant> <constant1> <constant2> <constant3> <constant4> +option05.option.description=d\u00e9scription option05 + Property changes on: trunk/commandline/maven/src/test/resources/testOptions.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/commandline/maven/src/test/resources/testOptions2.properties (from rev 821, trunk/maven-commandline-plugin/src/test/testOptions2.properties) =================================================================== --- trunk/commandline/maven/src/test/resources/testOptions2.properties (rev 0) +++ trunk/commandline/maven/src/test/resources/testOptions2.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -0,0 +1,24 @@ +list.option.definition=--list|-l * <analyseplans|exports|formules|regions|rules|scripts|simulations|simulators> [filter:String] +list.option.description=affiche la liste d'un certain type d'objects Isis \ + (analyseplans|exports|formules|regions|rules|scripts|simulations|simulators)\ + avec possibilit\u00e9 d'appliquer un filtre (filter) + +addScript.option.definition=--add|-a <analyseplans|exports|formules=String|rules|scripts|simulators> <file:File+> [check|force] +addScript.option.description=ajoute un script d'un certain type (analyseplans|exports|\ + formules=type|rules|scripts|simulators) \u00e0 partir d'un fichier existant \ + (file) (pour les formules il faut pr\u00e9ciser son type) + +config.option.definition=--config * <key:String> <value:String> +config.option.description=change one config option with (key) with new (value) + +resetConfig.option.definition=--resetConfig +resetConfig.option.description=Reset user configuration + +ui.option.definition=--ui <value:Boolean> +ui.option.description=launch or not user interface (value) + +mavenFile.option.definition=--mavenFile +mavenFile.option.description=Checkout maven file from server (pom.xml) + +help.option.definition=--help|-h +help.option.description=Show this help Property changes on: trunk/commandline/maven/src/test/resources/testOptions2.properties ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: trunk/maven-commandline-plugin/src/resources/log4j.properties =================================================================== --- trunk/maven-commandline-plugin/src/resources/log4j.properties 2008-07-08 15:10:55 UTC (rev 836) +++ trunk/maven-commandline-plugin/src/resources/log4j.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -1,9 +0,0 @@ -# Global logging configuration -log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -# package level -log4j.logger.org.codelutin=INFO Deleted: trunk/maven-commandline-plugin/src/test/PropertiesLoaderTest.properties =================================================================== --- trunk/maven-commandline-plugin/src/test/PropertiesLoaderTest.properties 2008-07-08 15:10:55 UTC (rev 836) +++ trunk/maven-commandline-plugin/src/test/PropertiesLoaderTest.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -1,44 +0,0 @@ -# pour tester une option sans argument -option0.option.definition=--option0|-0 - -# pour tester une option avec 1 argument constant -option1.option.definition=--option1|-1 <constant|constant2|constant3|constant4> - -# pour tester une option avec 1 argument valu� (avec un string) -option2.option.definition=--option2|-2 <string:String|float:Float|file:File|class:class> - -# pour tester une option avec 1 argument valu� (avec un newfile) -option3.option.definition=--option3|-3 <integer:integer|file:File|newfile:NewFile|class:class> - -# pour tester une option avec 1 argument nomm� et valu� -option4.option.definition=--option4|-4 <string=String|integer=Integer|float=Float|file=File|file=NewFile|class=Class> - -# pour tester la nom prise encompte de cette option (option generique) -help.option.definition=--help|-h2 - -main2.config.definition.version2=org.codelutin.util.VersionNumber:3.1.2 -main2.config.modifiers.version2=final,static,mandatory - -main2.config.definition.configFileName2=java.io.File:.isis-config-3 -main2.config.modifiers.configFileName2=final,mandatory,transient - -main2.config.definition.encoding2=java.lang.String:ISO-8859-1 -main2.config.modifiers.encoding2=final,static,mandatory - -main2.config.definition.locale2=java.util.Locale:fr_FR -main2.config.modifiers.locale2=mandatory - -main2.config.definition.projectName2=java.lang.String:Isis-Fish -main2.config.modifiers.projectName2=final,static,mandatory - -main.config.definition.encoding=java.lang.String:ISO-8859-1 -main.config.modifiers.encoding=final,static,mandatory - -main.config.definition.locale=java.util.Locale:fr_FR -main.config.modifiers.locale=mandatory - -main.config.definition.version2=org.codelutin.util.VersionNumber:3.1.2 -main.config.modifiers.version2=final,static,mandatory - -main.config.definition.version3=org.codelutin.util.VersionNumber:3.1.2 -main.config.modifiers.version3=final,static,mandatory \ No newline at end of file Deleted: trunk/maven-commandline-plugin/src/test/log4j.properties =================================================================== --- trunk/maven-commandline-plugin/src/test/log4j.properties 2008-07-08 15:10:55 UTC (rev 836) +++ trunk/maven-commandline-plugin/src/test/log4j.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -1,12 +0,0 @@ -# Global logging configuration -log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X -# package level -log4j.logger.org.codelutin.commandline=INFO -log4j.logger.org.codelutin.i18n=INFO -log4j.logger.org.codelutin.util=INFO -log4j.logger.org.codelutin.option=INFO Deleted: trunk/maven-commandline-plugin/src/test/testOptions.properties =================================================================== --- trunk/maven-commandline-plugin/src/test/testOptions.properties 2008-07-08 15:10:55 UTC (rev 836) +++ trunk/maven-commandline-plugin/src/test/testOptions.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -1,18 +0,0 @@ -option00.option.definition=--option00|-0 -option00.option.description=description option00 - -option01.option.definition=--option01|-1 + <constant|string:String{2}|integer=Integer|float:Float|file:File> -option01.option.description=description option01 - -option02.option.definition=--option02|-2 * <constant|string:String|integer=Integer|float:Float|file:File> [constant1|string1:String|integer1=Integer|float1:Float|file1:File] -option02.option.description=description option02 - -option03.option.definition=--option03|-3 {0,1} <constant|string:String|integer=Integer|float:Float+|file:File> <constant1|string1:String|integer1=Integer|float1:Float|file1:File> -option03.option.description=description option03 - -option04.option.definition=--option04|-4 {1} <constant|string:String+|integer=Integer{4}|float:Float|file:File> <constant1|string1:String|integer1=Integer|float1:Float|file1:File> [constant2|string2:String|integer2=Integer|float2:Float|file2:File] -option04.option.description=d\u00e9scription option04 - -option05.option.definition=--option05|-5 {5,*} <constant> <constant1> <constant2> <constant3> <constant4> -option05.option.description=d\u00e9scription option05 - Deleted: trunk/maven-commandline-plugin/src/test/testOptions2.properties =================================================================== --- trunk/maven-commandline-plugin/src/test/testOptions2.properties 2008-07-08 15:10:55 UTC (rev 836) +++ trunk/maven-commandline-plugin/src/test/testOptions2.properties 2008-07-08 15:13:29 UTC (rev 837) @@ -1,24 +0,0 @@ -list.option.definition=--list|-l * <analyseplans|exports|formules|regions|rules|scripts|simulations|simulators> [filter:String] -list.option.description=affiche la liste d'un certain type d'objects Isis \ - (analyseplans|exports|formules|regions|rules|scripts|simulations|simulators)\ - avec possibilit\u00e9 d'appliquer un filtre (filter) - -addScript.option.definition=--add|-a <analyseplans|exports|formules=String|rules|scripts|simulators> <file:File+> [check|force] -addScript.option.description=ajoute un script d'un certain type (analyseplans|exports|\ - formules=type|rules|scripts|simulators) \u00e0 partir d'un fichier existant \ - (file) (pour les formules il faut pr\u00e9ciser son type) - -config.option.definition=--config * <key:String> <value:String> -config.option.description=change one config option with (key) with new (value) - -resetConfig.option.definition=--resetConfig -resetConfig.option.description=Reset user configuration - -ui.option.definition=--ui <value:Boolean> -ui.option.description=launch or not user interface (value) - -mavenFile.option.definition=--mavenFile -mavenFile.option.description=Checkout maven file from server (pom.xml) - -help.option.definition=--help|-h -help.option.description=Show this help