October 2008 - Isis-fish-commits - mailman.cloud.codelutin.com

r1522 - isis-fish/branches/arbo-maven
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

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 @@  <parent> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> + <version>3.0</version> </parent>  @@ -160,12 +160,12 @@ </plugin> -->  - <plugin> + +- - > <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 - - > <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.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>  <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>  <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> + </plugin> - <plugin> - <groupId>org.codelutin.plugin</groupId> + <plugin> + <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> - <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>  <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>  <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>  <maven.src.dir> - ${basedir}/target/src-build + ${basedir}/target/generated-sources </maven.src.dir>  @@ -1014,7 +1001,7 @@ <properties>  <maven.src.dir> - ${basedir}/target/src-build + ${basedir}/target/generated-sources </maven.src.dir>

1 0

r1521 - isis-fish/branches/arbo-maven/src
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:57:30 +0000 (Tue, 07 Oct 2008) New Revision: 1521 Removed: isis-fish/branches/arbo-maven/src/jnlp/ Log: arborenscence maven2

1 0

r1520 - in isis-fish/branches/arbo-maven/src: jnlp main/resources/jnlp
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:56:58 +0000 (Tue, 07 Oct 2008) New Revision: 1520 Added: isis-fish/branches/arbo-maven/src/main/resources/jnlp/template.vm Removed: isis-fish/branches/arbo-maven/src/jnlp/template.vm Log: arborenscence maven2 Deleted: isis-fish/branches/arbo-maven/src/jnlp/template.vm =================================================================== --- isis-fish/branches/arbo-maven/src/jnlp/template.vm 2008-10-07 13:56:26 UTC (rev 1519) +++ isis-fish/branches/arbo-maven/src/jnlp/template.vm 2008-10-07 13:56:58 UTC (rev 1520) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jnlp spec="1.0+" codebase="http://isis-fish.labs.libre-entreprise.org/jnlp" href="$outputFile"> - <information> - <title>Isis-Fish v3</title> - <vendor>Code Lutin</vendor> - <homepage href="http://www.codelutin.com" /> - <description>Simulateur de pecherie complexe v3</description> - <offline-allowed /> - </information> - <resources> - <j2se version="1.5+" max-heap-size="512m"/> -$dependencies - <extension name="sun" href="sun.jnlp"/> - </resources> - <security> - <all-permissions /> - </security> - <application-desc main-class="$mainClass" /> -</jnlp> Copied: isis-fish/branches/arbo-maven/src/main/resources/jnlp/template.vm (from rev 1519, isis-fish/branches/arbo-maven/src/jnlp/template.vm) =================================================================== --- isis-fish/branches/arbo-maven/src/main/resources/jnlp/template.vm (rev 0) +++ isis-fish/branches/arbo-maven/src/main/resources/jnlp/template.vm 2008-10-07 13:56:58 UTC (rev 1520) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="http://isis-fish.labs.libre-entreprise.org/jnlp" href="$outputFile"> + <information> + <title>Isis-Fish v3</title> + <vendor>Code Lutin</vendor> + <homepage href="http://www.codelutin.com" /> + <description>Simulateur de pecherie complexe v3</description> + <offline-allowed /> + </information> + <resources> + <j2se version="1.5+" max-heap-size="512m"/> +$dependencies + <extension name="sun" href="sun.jnlp"/> + </resources> + <security> + <all-permissions /> + </security> + <application-desc main-class="$mainClass" /> +</jnlp>

1 0

r1519 - in isis-fish/branches/arbo-maven/src: jnlp main/resources/jnlp
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:56:26 +0000 (Tue, 07 Oct 2008) New Revision: 1519 Added: isis-fish/branches/arbo-maven/src/main/resources/jnlp/sun.jnlp Removed: isis-fish/branches/arbo-maven/src/jnlp/sun.jnlp Log: arborenscence maven2 Deleted: isis-fish/branches/arbo-maven/src/jnlp/sun.jnlp =================================================================== --- isis-fish/branches/arbo-maven/src/jnlp/sun.jnlp 2008-10-07 13:55:18 UTC (rev 1518) +++ isis-fish/branches/arbo-maven/src/jnlp/sun.jnlp 2008-10-07 13:56:26 UTC (rev 1519) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<jnlp spec="1.0+" codebase="http://isis-fish.labs.libre-entreprise.org/jnlp" href="sun.jnlp"> - <information> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <offline-allowed /> - </information> - <resources> - -<jar href="@mail@"/> -<jar href="@activation@"/> - - </resources> - <component-desc/> -</jnlp> \ No newline at end of file Copied: isis-fish/branches/arbo-maven/src/main/resources/jnlp/sun.jnlp (from rev 1518, isis-fish/branches/arbo-maven/src/jnlp/sun.jnlp) =================================================================== --- isis-fish/branches/arbo-maven/src/main/resources/jnlp/sun.jnlp (rev 0) +++ isis-fish/branches/arbo-maven/src/main/resources/jnlp/sun.jnlp 2008-10-07 13:56:26 UTC (rev 1519) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="http://isis-fish.labs.libre-entreprise.org/jnlp" href="sun.jnlp"> + <information> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <offline-allowed /> + </information> + <resources> + +<jar href="@mail@"/> +<jar href="@activation@"/> + + </resources> + <component-desc/> +</jnlp> \ No newline at end of file

1 0

r1518 - in isis-fish/branches/arbo-maven/src: . main
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:55:18 +0000 (Tue, 07 Oct 2008) New Revision: 1518 Added: isis-fish/branches/arbo-maven/src/main/xmi/ Removed: isis-fish/branches/arbo-maven/src/xmi/ Log: arborenscence maven2 Copied: isis-fish/branches/arbo-maven/src/main/xmi (from rev 1517, isis-fish/branches/arbo-maven/src/xmi)

1 0

r1517 - in isis-fish/branches/arbo-maven/src: . main
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:54:54 +0000 (Tue, 07 Oct 2008) New Revision: 1517 Added: isis-fish/branches/arbo-maven/src/main/uimodel/ Removed: isis-fish/branches/arbo-maven/src/uimodel/ Log: arborenscence maven2 Copied: isis-fish/branches/arbo-maven/src/main/uimodel (from rev 1516, isis-fish/branches/arbo-maven/src/uimodel)

1 0

r1516 - in isis-fish/branches/arbo-maven/src: . main
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:54:17 +0000 (Tue, 07 Oct 2008) New Revision: 1516 Added: isis-fish/branches/arbo-maven/src/main/resources/ Removed: isis-fish/branches/arbo-maven/src/resources/ Log: arborenscence maven2 Copied: isis-fish/branches/arbo-maven/src/main/resources (from rev 1515, isis-fish/branches/arbo-maven/src/resources)

1 0

r1515 - in isis-fish/branches/arbo-maven/src: . main
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:52:36 +0000 (Tue, 07 Oct 2008) New Revision: 1515 Added: isis-fish/branches/arbo-maven/src/main/java/ Removed: isis-fish/branches/arbo-maven/src/java/ Log: arborenscence maven2 Copied: isis-fish/branches/arbo-maven/src/main/java (from rev 1514, isis-fish/branches/arbo-maven/src/java)

1 0

r1514 - in isis-fish/branches/arbo-maven: . src
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:51:29 +0000 (Tue, 07 Oct 2008) New Revision: 1514 Added: isis-fish/branches/arbo-maven/src/main/ Removed: isis-fish/branches/arbo-maven/main/ Log: arborenscence maven2 Copied: isis-fish/branches/arbo-maven/src/main (from rev 1513, isis-fish/branches/arbo-maven/main)

1 0

r1513 - isis-fish/branches/arbo-maven
by sletellier＠users.labs.libre-entreprise.org 07 Oct '08

07 Oct '08

Author: sletellier Date: 2008-10-07 13:49:38 +0000 (Tue, 07 Oct 2008) New Revision: 1513 Added: isis-fish/branches/arbo-maven/main/ Log: arborenscence maven2

1 0