Author: tchemit Date: 2009-02-18 10:06:26 +0000 (Wed, 18 Feb 2009) New Revision: 1346 Modified: commandline/trunk/commandline-core/pom.xml commandline/trunk/commandline-demo/pom.xml commandline/trunk/commandline-ui-action/pom.xml 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/commandline-ui/pom.xml commandline/trunk/maven-commandline-plugin/pom.xml commandline/trunk/pom.xml Log: zeroConf when possible (i18n) Modified: commandline/trunk/commandline-core/pom.xml =================================================================== --- commandline/trunk/commandline-core/pom.xml 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/commandline-core/pom.xml 2009-02-18 10:06:26 UTC (rev 1346) @@ -14,6 +14,13 @@ <artifactId>commandline-core</artifactId> <name>commandline-core</name> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + </dependency> + </dependencies> + <packaging>jar</packaging> <description>lutincommandline core library</description> Modified: commandline/trunk/commandline-demo/pom.xml =================================================================== --- commandline/trunk/commandline-demo/pom.xml 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/commandline-demo/pom.xml 2009-02-18 10:06:26 UTC (rev 1346) @@ -20,25 +20,26 @@ <dependencies> - <!-- librairie commandline --> + <!-- sibling dependencies --> <dependency> - <groupId>org.codelutin.commandline</groupId> + <groupId>${project.groupId}</groupId> <artifactId>commandline-core</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.commandline</groupId> + <groupId>${project.groupId}</groupId> <artifactId>commandline-ui</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.commandline</groupId> + <groupId>${project.groupId}</groupId> <artifactId>commandline-ui-action</artifactId> <version>${project.version}</version> </dependency> + <!-- other dependencies --> <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> @@ -145,6 +146,7 @@ </goals> </execution> </executions> + <!-- FIXME : plugin wants to use the LutinLogFactory why ? --> <dependencies> <dependency> <groupId>org.codelutin</groupId> @@ -156,9 +158,11 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + </execution> + </executions> </plugin> <plugin> Modified: commandline/trunk/commandline-ui/pom.xml =================================================================== --- commandline/trunk/commandline-ui/pom.xml 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/commandline-ui/pom.xml 2009-02-18 10:06:26 UTC (rev 1346) @@ -20,18 +20,20 @@ <dependencies> + <!-- sibling dependencies --> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>commandline-core</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.codelutin.commandline</groupId> - <artifactId>commandline-core</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> </dependencies> Modified: commandline/trunk/commandline-ui-action/pom.xml =================================================================== --- commandline/trunk/commandline-ui-action/pom.xml 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/commandline-ui-action/pom.xml 2009-02-18 10:06:26 UTC (rev 1346) @@ -19,8 +19,9 @@ <dependencies> + <!-- sibling dependencies --> <dependency> - <groupId>org.codelutin.commandline</groupId> + <groupId>${project.groupId}</groupId> <artifactId>commandline-ui</artifactId> <version>${project.version}</version> </dependency> 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 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2009-02-18 10:06:26 UTC (rev 1346) @@ -1,4 +1,3 @@ -commandline= commandline.action.about=About commandline.action.about.help= commandline.action.about.tooltip=Show about ui 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 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2009-02-18 10:06:26 UTC (rev 1346) @@ -1,4 +1,3 @@ -commandline= commandline.action.about=A propos commandline.action.about.help= commandline.action.about.tooltip=Afficher les informations sur l'application Modified: commandline/trunk/maven-commandline-plugin/pom.xml =================================================================== --- commandline/trunk/maven-commandline-plugin/pom.xml 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/maven-commandline-plugin/pom.xml 2009-02-18 10:06:26 UTC (rev 1346) @@ -19,8 +19,10 @@ <artifactId>maven-commandline-plugin</artifactId> <dependencies> + + <!-- sibling dependencies --> <dependency> - <groupId>org.codelutin.commandline</groupId> + <groupId>${project.groupId}</groupId> <artifactId>commandline-core</artifactId> <version>${project.version}</version> <scope>compile</scope> @@ -48,7 +50,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinpluginutil</artifactId> - <version>0.2</version> + <version>${lutinpluginutil.version}</version> <scope>compile</scope> </dependency> Modified: commandline/trunk/pom.xml =================================================================== --- commandline/trunk/pom.xml 2009-02-18 10:05:42 UTC (rev 1345) +++ commandline/trunk/pom.xml 2009-02-18 10:06:26 UTC (rev 1346) @@ -27,14 +27,6 @@ <module>commandline-demo</module> </modules> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - </dependency> - </dependencies> - - <dependencyManagement> <dependencies> @@ -55,6 +47,16 @@ <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> <version>${lutinwidget.version}</version> + <exclusions> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>sdoc</groupId> + <artifactId>sdoc</artifactId> + </exclusion> + </exclusions> </dependency> <!-- jaxx library --> @@ -112,14 +114,11 @@ <!-- libs version --> <jaxx.version>1.1-SNAPSHOT</jaxx.version> - <lutinwidget.version>0.12</lutinwidget.version> - + <i18n.version>0.9-SNAPSHOT</i18n.version> </properties> <build> - <defaultGoal>install</defaultGoal> - <pluginManagement> <plugins> @@ -128,25 +127,6 @@ <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version> - <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> - <encoding>${project.build.sourceEncoding}</encoding> - <src>${maven.src.dir}/main/resources/i18n</src> - <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> - <keysModifier>false</keysModifier> - <keepBackup>false</keepBackup> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> </plugin> <!-- plugin jaxx -->