Author: tchemit Date: 2009-04-09 16:37:36 +0000 (Thu, 09 Apr 2009) New Revision: 381 Added: lutinproject/trunk/src/site/rst/ lutinproject/trunk/src/site/rst/MavenProjectBestPractices.rst lutinproject/trunk/src/site/rst/Todo.rst lutinproject/trunk/src/site/rst/images/ lutinproject/trunk/src/site/rst/images/jrst-logo.png lutinproject/trunk/src/site/rst/index.rst Modified: lutinproject/trunk/changelog.txt lutinproject/trunk/pom.xml lutinproject/trunk/src/site/site.xml Log: preparation release 3.5 (sans jrst et utilisation de doxia-module-jrst) Modified: lutinproject/trunk/changelog.txt =================================================================== --- lutinproject/trunk/changelog.txt 2009-04-09 16:35:39 UTC (rev 380) +++ lutinproject/trunk/changelog.txt 2009-04-09 16:37:36 UTC (rev 381) @@ -1,4 +1,8 @@ -3.4.0 chemit 20090128 +3.5 chemit 20090409 + * 20090409 [chemit] - remove all dependencies to jrst, now prefer use doxia-module-jrst + - use javadoc 2.5 (can not be used for multi-module projects) + +3.4 chemit 20090128 * 20090218 [chemit] - release 3.4 - remove all dependencies to our libs and plugin Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2009-04-09 16:35:39 UTC (rev 380) +++ lutinproject/trunk/pom.xml 2009-04-09 16:37:36 UTC (rev 381) @@ -230,7 +230,8 @@ <!-- to activate generation of reports and javadoc when doing a site --> <maven.reports.generate>true</maven.reports.generate> - <javadoc.version>2.4</javadoc.version> + <javadoc.version>2.5</javadoc.version> + <lutin-enforcer-rules.version>0.2</lutin-enforcer-rules.version> <!-- default license to use --> @@ -282,12 +283,12 @@ </resource> <!-- FIXME this resource should not be always included in our super-pom ! --> - <resource> + <!--resource> <directory>${maven.src.dir}/main/xsl</directory> <includes> <include>**/*.xsl</include> </includes> - </resource> + </resource--> </resources> <pluginManagement> @@ -488,31 +489,6 @@ <plugins> - <!--Tasks Ant--> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!--Copy files for site--> - <execution> - <id>CopySiteFiles</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.src.dir}/site" /> - <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${maven.src.dir}/site"> - <exclude name="**/rst/**" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> @@ -672,9 +648,9 @@ </scm> --> <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinbuilder/lutinproject/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinbuilder/lutinproject/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinproject/trunk/?root=lutinbuilder</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> <!-- ************************************************************* --> @@ -837,30 +813,9 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <!-- on ne peut pas utiliser jrst.version car cela - pose des problèmes pendant les montées de version --> - <version>0.8.4</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.build.sourceEncoding}</outputEncoding> - </configuration> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> + </plugins> + </build> </profile> <!-- use this plugin to run the main class --> @@ -910,7 +865,7 @@ <goals> <goal>java</goal> </goals> - <phase>compile</phase> + <phase>package</phase> <configuration> <mainClass>${maven.jar.main.class}</mainClass> <classpathScope>runtime</classpathScope> @@ -933,7 +888,7 @@ <id>internalProfile</id> <activation> <file> - <exists>src/site/fr/rst/MavenProjectBestPractices.rst</exists> + <exists>src/site/rst/MavenProjectBestPractices.rst</exists> </file> <activeByDefault>false</activeByDefault> </activation> @@ -946,6 +901,29 @@ <properties> <site.home.url>http://${labs.project}.${labs.host}/${project.artifactId}</site.home.url> </properties> + + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <locales>fr</locales> + <siteDirectory>src/site</siteDirectory> + </configuration> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> + + </profile> </profiles> Copied: lutinproject/trunk/src/site/rst/MavenProjectBestPractices.rst (from rev 376, lutinproject/trunk/src/site/fr/rst/MavenProjectBestPractices.rst) =================================================================== --- lutinproject/trunk/src/site/rst/MavenProjectBestPractices.rst (rev 0) +++ lutinproject/trunk/src/site/rst/MavenProjectBestPractices.rst 2009-04-09 16:37:36 UTC (rev 381) @@ -0,0 +1,55 @@ +===================== +Maven 2 best pratices +===================== + + +.. contents:: + + +Présentation +------------ + +Ce document énumère les bonnes pratiques à retenir sur l'utilisation de maven 2. + +Préconisations générales +------------------------ + +Inspiration du document http://www.javaworld.com/javaworld/jw-05-2006/jw-0529-maven.html . + +.. image:: http://www.javaworld.com/javaworld/jw-05-2006/images/jw-0529-maven1.gif + +- toujours respecter la même organisation dans nos pom + +- les principales sections d'un pom : + + - POM Relationships + + - Project Information + + - Build Settings + + - Build Environment + + - Maven Environment + +A faire + +Création d'un nouveau projet lutin +---------------------------------- + +A faire + +Création d'un nouveau projet lutin multi-modules +------------------------------------------------ + +A faire + +Création d'un nouveau plugin lutin +---------------------------------- + +A faire + +Les plugins utilisés +-------------------- + +A faire Property changes on: lutinproject/trunk/src/site/rst/MavenProjectBestPractices.rst ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutinproject/trunk/src/site/rst/Todo.rst (from rev 376, lutinproject/trunk/src/site/fr/rst/Todo.rst) =================================================================== --- lutinproject/trunk/src/site/rst/Todo.rst (rev 0) +++ lutinproject/trunk/src/site/rst/Todo.rst 2009-04-09 16:37:36 UTC (rev 381) @@ -0,0 +1,15 @@ +==== +TODO +==== + + +Création d'archetypes +--------------------- + +Il nous faudrait 2 archetypes pour la construction d'un nouveau projet : + + - un pour un projet no multi-modules + + - un pour les projets multi-modules + + \ No newline at end of file Property changes on: lutinproject/trunk/src/site/rst/Todo.rst ___________________________________________________________________ Name: svn:mergeinfo + Copied: lutinproject/trunk/src/site/rst/images/jrst-logo.png (from rev 376, lutinproject/trunk/src/site/fr/rst/images/jrst-logo.png) =================================================================== (Binary files differ) Property changes on: lutinproject/trunk/src/site/rst/images/jrst-logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Name: svn:mergeinfo + Copied: lutinproject/trunk/src/site/rst/index.rst (from rev 376, lutinproject/trunk/src/site/fr/rst/index.rst) =================================================================== --- lutinproject/trunk/src/site/rst/index.rst (rev 0) +++ lutinproject/trunk/src/site/rst/index.rst 2009-04-09 16:37:36 UTC (rev 381) @@ -0,0 +1,114 @@ +lutinproject +============ + +.. contents:: + + +Présentation +------------ + +Super pom de tous nos projets. + +Les propriétés définies +----------------------- + + - **labs.id** + + - **labs.project** + + - *labs.host* + + - *labs.list.host* + + - *labs.builder.url* + + - *site.home.url* + + - *maven.compile.source* + + - *maven.compile.target* + + - *maven.compile.encoding* + + - *maven.src.dir* + + - *maven.gen.dir* + + - *maven.site.gen.dir* + + - *maven.site.locales* + + - *maven.test.testFailureIgnore* + + - *maven.test.skip* + + - *maven.reports.generate* + + - *license-switcher.version* + + - *license-switcher.licenseName* + + - *maven.scm.url* + + - *maven.scm.developerConnection* + + - *maven.scm.connection* + + - *maven.scm.url.child* + + - *maven.scm.developerConnection.child* + + - *maven.scm.connection.child* + + - *maven.scm.url.child.child* + + - *maven.scm.developerConnection.child.child* + + - *maven.scm.connection.child.child* + + +.. WARNING:: + Expliquer à quoi servent ces propriétés. + +Vérification de conformité +-------------------------- + +On effectue sur le pom des contrôles de conformités via *maven-enforcer-plugin*. + +propriétés obligatoires +~~~~~~~~~~~~~~~~~~~~~~~ + + - *labs.id* : doit être un nombre + + - *labs.projects* : doit etre non vide et commencer par un mot + +fichiers obligatoires +~~~~~~~~~~~~~~~~~~~~~ + + - README.txt + + - changelog.txt + + - LICENSE.txt + + +Les plugins configurés +---------------------- + +.. WARNING:: + A faire + + +Montée en version d'un plugin +----------------------------- + +.. WARNING:: + A faire + + +La gestion scm +-------------- + +.. WARNING:: + A faire + Property changes on: lutinproject/trunk/src/site/rst/index.rst ___________________________________________________________________ Name: svn:mergeinfo + Modified: lutinproject/trunk/src/site/site.xml =================================================================== --- lutinproject/trunk/src/site/site.xml 2009-04-09 16:35:39 UTC (rev 380) +++ lutinproject/trunk/src/site/site.xml 2009-04-09 16:37:36 UTC (rev 381) @@ -20,21 +20,21 @@ <href>${project.organization.url}</href> </bannerRight> - <poweredBy> + <!--poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> + </poweredBy--> <body> - <links> + <!--links> <item name="Labs" href="http://labs.libre-entreprise.org/"/> <item name="${project.organization.name}" href="${project.organization.url}"/> <item name="lutinpluginproject" href="../lutinpluginproject"/> <item name="maven-lutin-skin" href="../maven-lutin-skin"/> <item name="lutin-enforcer-rules" href="../lutin-enforcer-rules"/> <item name="lutin maven repository" href="../maven2"/> - </links> + </links--> <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> @@ -51,6 +51,15 @@ <item name="A faire" href="Todo.html"/> </menu> + <menu name="Links"> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + <item name="lutinpluginproject" href="../lutinpluginproject"/> + <item name="maven-lutin-skin" href="../maven-lutin-skin"/> + <item name="lutin-enforcer-rules" href="../lutin-enforcer-rules"/> + <item name="lutin maven repository" href="../maven2"/> + </menu> + <menu ref="reports"/> <!--menu ref="modules"/-->