Author: chatellier Date: 2010-01-25 17:21:13 +0000 (Mon, 25 Jan 2010) New Revision: 2944 Added: isis-fish/trunk/src/site/rst/ Removed: isis-fish/trunk/.cvsignore isis-fish/trunk/src/site/fr/rst/ Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/site/rst/v2/user/ECMAScriptEdit.rst isis-fish/trunk/src/site/site_en.xml isis-fish/trunk/src/site/site_fr.xml Log: #2004 : Utilisation de mavenpom4labs 2.0.3 Deleted: isis-fish/trunk/.cvsignore =================================================================== --- isis-fish/trunk/.cvsignore 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/.cvsignore 2010-01-25 17:21:13 UTC (rev 2944) @@ -1,10 +0,0 @@ -maven.log -target -velocity.log -.classpath -.project -isis-fish.ipr -isis-fish.iws -isis-fish.iml -.settings -__poubelle__ Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/pom.xml 2010-01-25 17:21:13 UTC (rev 2944) @@ -3,6 +3,12 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4labs</artifactId> + <version>2.0.3</version> + </parent> + <groupId>ifremer</groupId> <artifactId>isis-fish</artifactId> <version>3.3.0.0-rc1-SNAPSHOT</version> @@ -422,6 +428,16 @@ </roles> <timezone>+2</timezone> </developer> + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau at codelutin.com</email> + <organization>CodeLutin</organization> + <roles> + <role>Développeur</role> + </roles> + <timezone>+2</timezone> + </developer> </developers> <!-- ************************************************************* --> @@ -430,14 +446,21 @@ <packaging>jar</packaging> <properties> - <!-- Custom version --> + <!-- Super pom properties --> + <projectId>isis-fish</projectId> + <labs.id>8</labs.id> + <javadoc.version>2.6.1</javadoc.version> + <siteLocales>fr,en</siteLocales> + <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> + + <!-- Dependencies version --> <jaxx.version>1.7.1</jaxx.version> <eugene.version>2.0.0-beta-3</eugene.version> <topia.version>2.3.0-beta-5</topia.version> - <nuiton-utils.version>1.1.3</nuiton-utils.version> + <nuiton-utils.version>1.1.4-SNAPSHOT</nuiton-utils.version> <nuiton-i18n.version>1.0.1</nuiton-i18n.version> <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> - <jrst.version>1.0.0</jrst.version> + <jrst.version>1.1.0</jrst.version> <aspectwerkz.version>2.0</aspectwerkz.version> <xmlrpc.version>3.1.2</xmlrpc.version> @@ -449,32 +472,25 @@ <jnlpCodebase>${project.url}</jnlpCodebase> <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> --> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> </properties> <build> <pluginManagement> <plugins> - <plugin> + <!-- <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.1</version> <configuration> - <source>1.6</source> - <target>1.6</target> - <!-- <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> --> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> </configuration> - </plugin> + </plugin> --> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.3</version> <configuration> <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>fr.ifremer.isisfish.IsisFish</mainClass> + <mainClass>${maven.jar.main.class}</mainClass> <classpathPrefix>lib/</classpathPrefix> <useUniqueVersions>false</useUniqueVersions> </manifest> @@ -483,7 +499,6 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> <configuration> <systemProperties> <property> @@ -509,15 +524,11 @@ </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <configuration> - <locales>fr,en</locales> - </configuration> <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin> @@ -620,7 +631,6 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> - <version>2.1</version> <executions> <execution> <id>copy-dependencies</id> @@ -637,7 +647,6 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> @@ -659,9 +668,7 @@ <reporting> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> <configuration> <links> <link>http://java.sun.com/javase/6/docs/api/</link> @@ -729,7 +736,7 @@ </site> </distributionManagement> - <profiles> + <!--<profiles> <profile> <id>release-profile</id> <activation> @@ -740,8 +747,6 @@ </activation> <build> <plugins> - - <!-- always add license and third-party files to classpath --> <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> @@ -750,14 +755,14 @@ <execution> <id>attach-licenses</id> <goals> - <!--<goal>add-license</goal>--> + <goal>add-license</goal> <goal>add-third-party</goal> </goals> </execution> </executions> - </plugin> + </plugin> - <!-- (disabled until retested) + < - - (disabled until retested) <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -879,12 +884,12 @@ <gzip>true</gzip> <verbose>false</verbose> </configuration> - </plugin> --> + </plugin> - - > </plugins> </build> </profile> - </profiles> + </profiles> --> </project> Modified: isis-fish/trunk/src/site/rst/v2/user/ECMAScriptEdit.rst =================================================================== --- isis-fish/trunk/src/site/fr/rst/v2/user/ECMAScriptEdit.rst 2010-01-22 16:00:18 UTC (rev 2941) +++ isis-fish/trunk/src/site/rst/v2/user/ECMAScriptEdit.rst 2010-01-25 17:21:13 UTC (rev 2944) @@ -10,6 +10,8 @@ .. contents:: +ECMAScriptEdit +-------------- L'editeur d'ECMAScript permet d'influer sur la façon dont isis-fish simule. Une partie du simulateur est écrit grâce à cette interface, il suffit de Modified: isis-fish/trunk/src/site/site_en.xml =================================================================== --- isis-fish/trunk/src/site/site_en.xml 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/src/site/site_en.xml 2010-01-25 17:21:13 UTC (rev 2944) @@ -1,11 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="Isis-fish"> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> <bannerLeft> <name>Isis-fish Simulator</name> @@ -45,13 +39,13 @@ <menu name="Version 3"> <item href="http://isis-fish.labs.libre-entreprise.org/devel/IsisFishModel.png" name="UML Model"></item> - <item href="/apidocs/index.html" name="Simulateur API"></item> + <item href="/isis-fish/apidocs/index.html" name="Simulateur API"></item> <item href="http://isis-fish.labs.libre-entreprise.org/download/version3" name="Download"></item> </menu> <menu name="Development documentations"> - <item href="http://isis-fish.labs.libre-entreprise.org/api/codelutin/index.html" name="Library API"></item> - <item href="http://lutinmatrix.labs.libre-entreprise.org/apidocs/index.html" name="Matrix API"></item> + <!-- <item href="http://isis-fish.labs.libre-entreprise.org/api/codelutin/index.html" name="Library API"></item> --> + <item href="http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html" name="Matrix API"></item> </menu> <menu name="Trackers"> @@ -62,7 +56,7 @@ </menu> <menu name="Liens"> - <item href="http://java.sun.com/j2se" name="Sun Java site"></item> + <item href="http://java.sun.com/javase" name="Sun Java site"></item> </menu> ${reports} Modified: isis-fish/trunk/src/site/site_fr.xml =================================================================== --- isis-fish/trunk/src/site/site_fr.xml 2010-01-25 13:45:47 UTC (rev 2943) +++ isis-fish/trunk/src/site/site_fr.xml 2010-01-25 17:21:13 UTC (rev 2944) @@ -2,12 +2,6 @@ <project name="Isis-fish"> <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> <bannerLeft> <name>Isis-fish Simulateur de pêcherie complexe</name> @@ -18,12 +12,11 @@ <href>http://www.codelutin.com</href> </bannerRight> - <poweredBy> - <logo href="http://argouml.tigris.org/" img="/images/argouml-logo.png" name="ArgoUML"/> - <logo href="http://docutils.sourceforge.net/rst.html" img="/images/restructuredtext-logo.png" name="reStructuredText"/> - <logo href="http://www.swixat.org" img="/images/swixat-logo.png" name="SwiXAT"/> - <logo href="http://topia.labs.libre-entreprise.org/" img="/images/topia-logo.png" name="ToPIA"/> - </poweredBy> + <poweredBy> + <logo href="http://argouml.tigris.org/" img="/images/argouml-logo.png" name="ArgoUML"/> + <logo href="http://docutils.sourceforge.net/rst.html" img="/images/restructuredtext-logo.png" name="reStructuredText"/> + <logo href="http://topia.labs.libre-entreprise.org/" img="/images/topia-logo.png" name="ToPIA"/> + </poweredBy> <body> <links> @@ -66,9 +59,9 @@ </menu> <menu name="Autres documentations"> - <item href="http://java.sun.com/j2se/api/index.html" name="API Java"></item> - <item href="http://lutinmatrix.labs.libre-entreprise.org/apidocs/index.html" name="API des matrices"></item> - <item href="http://topia.labs.libre-entreprise.org/apidocs/index.html" name="API ToPIA (DB)"></item> + <item href="http://java.sun.com/javase/6/docs/api/index.html" name="API Java" /> + <item href="http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html" name="API des matrices" /> + <item href="http://maven-site.nuiton.org/topia/topia-persistence/apidocs/index.html" name="API ToPIA (DB)" /> </menu> <menu name="Old version"> @@ -103,7 +96,7 @@ </menu> <menu name="Liens"> - <item href="http://java.sun.com/j2se" name="Le site Java de Sun"></item> + <item href="http://java.sun.com/javase" name="Le site Java de Sun"></item> </menu> ${reports}