September 2008 - Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r1075 - trunk/maven-license-switcher-plugin
by tchemit＠users.labs.libre-entreprise.org 22 Sep '08

22 Sep '08

Author: tchemit Date: 2008-09-22 09:14:12 +0000 (Mon, 22 Sep 2008) New Revision: 1075 Removed: trunk/maven-license-switcher-plugin/THIRD-PARTY.txt Modified: trunk/maven-license-switcher-plugin/pom.xml Log: using lutinpluginproject 3.0 remove third-party.txt Deleted: trunk/maven-license-switcher-plugin/THIRD-PARTY.txt =================================================================== --- trunk/maven-license-switcher-plugin/THIRD-PARTY.txt 2008-09-02 14:37:00 UTC (rev 1074) +++ trunk/maven-license-switcher-plugin/THIRD-PARTY.txt 2008-09-22 09:14:12 UTC (rev 1075) @@ -1,29 +0,0 @@ -List of third-party dependencies grouped by their license type. - -Common Public License Version 1.0 : - * JUnit (junit:junit:3.8.1 - http://junit.org) - -LGPL : - * Lutin file processor (org.codelutin:lutinprocessor:0.14 - http://labs.libre-entreprise.org/projects/lutinbuilder) - * Lutin plugin utilities library (org.codelutin:lutinpluginutil:0.1 - http://labs.libre-entreprise.org/projects/lutinutil) - -The Apache Software License, Version 2.0 : - * Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) - * Maven Artifact (org.apache.maven:maven-artifact:2.0.4 - http://maven.apache.org/maven-artifact) - * Maven Artifact Manager (org.apache.maven:maven-artifact-manager:2.0.4 - http://maven.apache.org/maven-artifact-manager) - * Maven Dependency Tree (org.apache.maven.shared:maven-dependency-tree:1.1 - http://maven.apache.org/shared/maven-dependency-tree) - * Maven Local Settings Model (org.apache.maven:maven-settings:2.0.4 - http://maven.apache.org/maven-settings) - * Maven Model (org.apache.maven:maven-model:2.0.4 - http://maven.apache.org/maven-model) - * Maven Plugin API (org.apache.maven:maven-plugin-api:2.0.4 - http://maven.apache.org/maven-plugin-api) - * Maven Profile Model (org.apache.maven:maven-profile:2.0.4 - http://maven.apache.org/maven-profile) - * Maven Project Builder (org.apache.maven:maven-project:2.0.4 - http://maven.apache.org/maven-project) - * Maven Project Builder (org.apache.maven:maven-project:2.0.8 - http://maven.apache.org/maven-project) - * Maven Repository Metadata Model (org.apache.maven:maven-repository-metadata:2.0.4 - http://maven.apache.org/maven-repository-metadata) - * Maven Wagon API (org.apache.maven.wagon:wagon-provider-api:1.0-alpha-6 - no url defined) - * Unnamed - ant:ant:jar:1.6.5 (ant:ant:1.6.5 - http://www.apache.org/ant) - -Unknown license : - * Default Plexus Container (org.codehaus.plexus:plexus-container-default:1.0-alpha-9 - no url defined) - * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:1.0.4 - no url defined) - * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:1.1 - no url defined) - * classworlds (classworlds:classworlds:1.1-alpha-2 - http://classworlds.codehaus.org/) \ No newline at end of file Modified: trunk/maven-license-switcher-plugin/pom.xml =================================================================== --- trunk/maven-license-switcher-plugin/pom.xml 2008-09-02 14:37:00 UTC (rev 1074) +++ trunk/maven-license-switcher-plugin/pom.xml 2008-09-22 09:14:12 UTC (rev 1075) @@ -9,35 +9,21 @@  <parent> <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>2.4</version> + <artifactId>lutinpluginproject</artifactId> + <version>3.0</version> </parent> - <groupId>org.codelutin.plugin</groupId> + <groupId>org.codelutin.plugins</groupId> <artifactId>maven-license-switcher-plugin</artifactId> <dependencies> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.4</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.4</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> <version>1.1</version> </dependency> - + <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinprocessor</artifactId> @@ -45,20 +31,13 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>0.1</version> - <scope>compile</scope> - </dependency> - </dependencies>    <name>Plugin maven pour switcher les licenses</name> - <version>0.1</version> + <version>0.2</version> <description>Plugin pour switcher de license dans un module maven 2</description> <inceptionYear>2008</inceptionYear> @@ -74,15 +53,27 @@ <build> <plugins> +  <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> - -  - <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-jrst-plugin</artifactId> + <version>0.8</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <verbose>${maven.verbose}</verbose> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> </plugin> </plugins> @@ -110,16 +101,4 @@ <url>${maven.scm.url}</url> </scm> - <reporting> - <plugins> - -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> - - </plugins> - </reporting> - </project>

1 0

[Lutinutil-commits] r1074 - trunk/lutinutil
by chatellier＠users.labs.libre-entreprise.org 02 Sep '08

02 Sep '08

Author: chatellier Date: 2008-09-02 14:37:00 +0000 (Tue, 02 Sep 2008) New Revision: 1074 Modified: trunk/lutinutil/pom.xml Log: Switch to next snapshot Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-09-02 13:03:17 UTC (rev 1073) +++ trunk/lutinutil/pom.xml 2008-09-02 14:37:00 UTC (rev 1074) @@ -42,7 +42,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> + <version>1.8.0</version> <scope>compile</scope> </dependency> @@ -54,7 +54,7 @@  <name>Lutin utilities library</name> - <version>0.30</version> + <version>0.31-SNAPSHOT</version> <description>Library of usefull class to be used in any project.</description> <inceptionYear>2004</inceptionYear> <url>${labs.project.url}</url>

1 0

[Lutinutil-commits] r1073 - tags/0.30
by sletellier＠users.labs.libre-entreprise.org 02 Sep '08

02 Sep '08

Author: sletellier Date: 2008-09-02 13:03:17 +0000 (Tue, 02 Sep 2008) New Revision: 1073 Added: tags/0.30/lutinutil/ Log: Tag 0.30 Copied: tags/0.30/lutinutil (from rev 1072, trunk/lutinutil)

1 0

[Lutinutil-commits] r1072 - tags
by sletellier＠users.labs.libre-entreprise.org 02 Sep '08

02 Sep '08

Author: sletellier Date: 2008-09-02 13:02:56 +0000 (Tue, 02 Sep 2008) New Revision: 1072 Added: tags/0.30/ Log: mkdir 0.30

1 0

[Lutinutil-commits] r1071 - trunk/lutinutil
by sletellier＠users.labs.libre-entreprise.org 02 Sep '08

02 Sep '08

Author: sletellier Date: 2008-09-02 12:55:15 +0000 (Tue, 02 Sep 2008) New Revision: 1071 Modified: trunk/lutinutil/pom.xml Log: pom stable Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-09-02 12:32:51 UTC (rev 1070) +++ trunk/lutinutil/pom.xml 2008-09-02 12:55:15 UTC (rev 1071) @@ -54,7 +54,7 @@  <name>Lutin utilities library</name> - <version>0.30-SNAPSHOT</version> + <version>0.30</version> <description>Library of usefull class to be used in any project.</description> <inceptionYear>2004</inceptionYear> <url>${labs.project.url}</url>

1 0

[Lutinutil-commits] r1070 - trunk/lutinutil
by chatellier＠users.labs.libre-entreprise.org 02 Sep '08

02 Sep '08

Author: chatellier Date: 2008-09-02 12:32:51 +0000 (Tue, 02 Sep 2008) New Revision: 1070 Modified: trunk/lutinutil/pom.xml Log: Switch to lutin pom v 2.5 Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-09-01 10:22:47 UTC (rev 1069) +++ trunk/lutinutil/pom.xml 2008-09-02 12:32:51 UTC (rev 1070) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.4</version> + <version>2.5</version> </parent> <artifactId>lutinutil</artifactId>

1 0

[Lutinutil-commits] r1069 - trunk/lutinutilextra
by bpoussin＠users.labs.libre-entreprise.org 01 Sep '08

01 Sep '08

Author: bpoussin Date: 2008-09-01 10:22:47 +0000 (Mon, 01 Sep 2008) New Revision: 1069 Modified: trunk/lutinutilextra/pom.xml Log: change version de dep Modified: trunk/lutinutilextra/pom.xml =================================================================== --- trunk/lutinutilextra/pom.xml 2008-09-01 09:59:44 UTC (rev 1068) +++ trunk/lutinutilextra/pom.xml 2008-09-01 10:22:47 UTC (rev 1069) @@ -35,24 +35,25 @@  <dependencies> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.0.3</version> + <version>[1.0.3,]</version> <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.1</version> + <version>[2.1,]</version> <scope>compile</scope> </dependency> @@ -76,16 +77,16 @@ <version>2.0</version> <scope>compile</scope> </dependency> - + </dependencies> -

1 0

[Lutinutil-commits] r1068 - trunk/lutinutil/src/main/java/org/codelutin/util
by bpoussin＠users.labs.libre-entreprise.org 01 Sep '08

01 Sep '08

Author: bpoussin Date: 2008-09-01 09:59:44 +0000 (Mon, 01 Sep 2008) New Revision: 1068 Modified: trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java Log: modif pour que les options de la ligne de commande aille dans le bon properties Modified: trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java =================================================================== --- trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-09-01 09:52:42 UTC (rev 1067) +++ trunk/lutinutil/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-09-01 09:59:44 UTC (rev 1068) @@ -279,6 +279,9 @@ String systemPath = File.separator + "etc" + File.separator; /** file $user.home/.[filename] */ String userPath = getUserHome() + File.separator + "."; + + /** vrai si on est en train de parser les options de la ligne de commande */ + protected boolean inParseOptionPhase = false; protected Properties defaults = new Properties(); protected Properties classpath = new Properties(defaults); @@ -507,7 +510,11 @@ * @param value property value */ public void setOption(String key, String value) { - options.setProperty(key, value); + if (inParseOptionPhase) { + line.setProperty(key, value); + } else { + options.setProperty(key, value); + } } /** @@ -819,6 +826,7 @@ } } + inParseOptionPhase = true; // first parse option for (ListIterator<String> i = arguments.listIterator(); i.hasNext();) { String arg = i.next(); @@ -837,6 +845,7 @@ } } } + inParseOptionPhase = false; // // second load options from all sources

1 0

[Lutinutil-commits] r1067 - trunk/maven-i18n-plugin
by bpoussin＠users.labs.libre-entreprise.org 01 Sep '08

01 Sep '08

Author: bpoussin Date: 2008-09-01 09:52:42 +0000 (Mon, 01 Sep 2008) New Revision: 1067 Modified: trunk/maven-i18n-plugin/pom.xml Log: modif pour utiliser lutinproject 2.5 mise de version dependance en variable Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2008-08-24 11:57:02 UTC (rev 1066) +++ trunk/maven-i18n-plugin/pom.xml 2008-09-01 09:52:42 UTC (rev 1067) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.4</version> + <version>2.5</version> </parent> <groupId>org.codelutin.plugin</groupId> @@ -35,7 +35,7 @@ <dependency> <groupId>lutinlib</groupId> <artifactId>lutinprocessor</artifactId> - <version>0.12</version> + <version>[0.12,]</version> <scope>compile</scope> </dependency> @@ -56,7 +56,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinpluginutil</artifactId> - <version>0.1</version> + <version>[0.1,]</version> <scope>compile</scope> </dependency>

1 0