Author: sletellier Date: 2008-10-07 15:05:41 +0000 (Tue, 07 Oct 2008) New Revision: 1522 Modified: isis-fish/branches/arbo-maven/pom.xml Log: arborescence maven2 Modified: isis-fish/branches/arbo-maven/pom.xml =================================================================== --- isis-fish/branches/arbo-maven/pom.xml 2008-10-07 13:57:30 UTC (rev 1521) +++ isis-fish/branches/arbo-maven/pom.xml 2008-10-07 15:05:41 UTC (rev 1522) @@ -8,9 +8,9 @@ <!--lutinproject.xml--> <parent> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> + <version>3.0</version> </parent> <!--A unique name for this project--> @@ -160,12 +160,12 @@ </plugin> --> <!--Attaching processor plugin to the Build Lifecycle--> - <plugin> +<!-- <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-processor-plugin</artifactId> -<!-- +<! - - <version>0.12</version> ---> +- - > <executions> <execution> <id>Processor</id> @@ -178,7 +178,7 @@ <configuration> <srcDir>${basedir}/src</srcDir> <destDir>${maven.src.dir}</destDir> - <!--destDir>${basedir}/target/src-build</destDir--> + <! - -destDir>${basedir}/target/src-build</destDir - - > <includes> <include>**/*.java</include> </includes> @@ -188,21 +188,19 @@ </filters> <verbose>${maven.verbose}</verbose> </configuration> - </plugin> + </plugin> --> <plugin> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> -<!-- - <version>[0.50,]</version> ---> + <version>0.51-SNAPSHOT</version> <executions> <execution> <id>Generator</id> <phase>generate-sources</phase> <configuration> - <srcDirZuml>src/xmi</srcDirZuml> - <srcXmiDest>target/gen/xmi/</srcXmiDest> + <srcDirZuml>src/main/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> <fullPackagePath> fr.ifremer.isisfish </fullPackagePath> @@ -211,19 +209,19 @@ </extractedPackages> <!--Config generator--> <srcGenDest> - target/gen/objectmodel/ + target/generated-sources/objectmodel/ </srcGenDest> <includes>**/*.objectmodel</includes> <templates> org.codelutin.topia.generator.TopiaMetaGenerator </templates> - <destDirGen>target/gen/java</destDirGen> + <destDirGen>target/generated-sources/java</destDirGen> <defaultPackage> fr.ifremer.isisfish </defaultPackage> <copyVersionDir> - src/resources/oldmappings/%MODELNAME% + src/main/resources/oldmappings/%MODELNAME% </copyVersionDir> <copyVersionFiles> **/*.hbm.xml @@ -240,9 +238,9 @@ </executions> <dependencies> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>[2.0.25,]</version> + <version>2.0.27-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> @@ -260,15 +258,15 @@ <goal>generate</goal> </goals> <configuration> - <src>src/uimodel</src> + <src>src/main/uimodel</src> </configuration> </execution> </executions> <dependencies> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> - <version>[0.9,]</version> + <version>0.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <!-- @@ -280,10 +278,10 @@ </dependency> --> <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing</artifactId> + <groupId>org.codelutin</groupId> + <artifactId>jaxx-core</artifactId> <scope>compile</scope> - <version>[0.2,]</version> + <version>0.5-SNAPSHOT</version> </dependency> </dependencies> </plugin> @@ -296,11 +294,11 @@ <configuration> <tasks> <copy - todir="${basedir}/target/src-build/java" + todir="${basedir}/target/generated-sources/java" verbose="${maven.verbose}" overwrite="false"> <fileset - dir="${basedir}/target/gen/java"/> + dir="${basedir}/target/generated-sources/java"/> </copy> </tasks> </configuration> @@ -315,8 +313,8 @@ <configuration> <tasks> <copy - file="${project.basedir}/src/jnlp/sun.jnlp" - todir="${project.basedir}/target/jnlp/"> + file="${project.basedir}/src/main/resources/jnlp/sun.jnlp" + todir="${project.basedir}/target/resources/jnlp/"> <filterset> <filter token="mail" value="mail-1.3.3.jar"/> @@ -326,10 +324,10 @@ </copy> <copy file="${project.build.directory}/dependency/mail-1.3.3.jar" - todir="${project.basedir}/target/jnlp/"/> + todir="${project.basedir}/target/resources/jnlp/"/> <copy file="${project.build.directory}/dependency/activation-1.0.2.jar" - todir="${project.basedir}/target/jnlp/"/> + todir="${project.basedir}/target/resources/jnlp/"/> </tasks> </configuration> <goals> @@ -415,7 +413,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <executions> +<!-- <executions> <execution> <id>copy-dependencies</id> <phase>compile</phase> @@ -433,40 +431,29 @@ <overWriteIfNewer>true</overWriteIfNewer> </configuration> </execution> - </executions> + </executions> --> </plugin> - <plugin> - <groupId>org.codelutin.plugin</groupId> + <plugin> + <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> -<!-- - <version>0.4</version> ---> <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> - <keysModifier>false</keysModifier> - <encoding>UTF-8</encoding> <entries> <entry> <basedir> - ${basedir}/target/gen/java/ + ${maven.gen.dir}/java/ </basedir> <specificGoal>parserJava</specificGoal> <includes> <param>**\/*Option*.java</param> <param>**\/*Config*.java</param> + <param>**\/*UI.java</param> </includes> </entry> </entries> </configuration> <executions> <execution> - <phase>compile</phase> <goals> - <goal>parserJaxx</goal> - <goal>parserSwixat</goal> <goal>parserJava</goal> <goal>gen</goal> </goals> @@ -539,9 +526,9 @@ </dependency> --> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>[2.0.25,]</version> + <version>2.0.27-SNAPSHOT</version> <scope>compile</scope> <!-- use javassist instead of cglib --> <exclusions> @@ -553,23 +540,23 @@ </dependency> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>topia-service</artifactId> - <version>[0.8,]</version> + <version>0.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinmatrix</artifactId> - <version>[1.0,]</version> + <version>1.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> - <version>[0.9,]</version> + <version>0.10-SNAPSHOT</version> <scope>compile</scope> </dependency> <!-- @@ -606,9 +593,9 @@ </dependency> --> <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing</artifactId> - <version>[0.2,]</version> + <groupId>org.codelutin</groupId> + <artifactId>jaxx-core</artifactId> + <version>0.5-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -741,9 +728,9 @@ </dependency> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinj2r</artifactId> - <version>[0.1,]</version> + <version>0.2-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -973,7 +960,7 @@ <properties> <!--Source base dir--> <maven.src.dir> - ${basedir}/target/src-build + ${basedir}/target/generated-sources </maven.src.dir> <!--Test--> @@ -1014,7 +1001,7 @@ <properties> <!--Source base dir--> <maven.src.dir> - ${basedir}/target/src-build + ${basedir}/target/generated-sources </maven.src.dir> <!--Test-->