Author: tchemit Date: 2010-01-26 21:12:50 +0100 (Tue, 26 Jan 2010) New Revision: 817 Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4labs/src/site/apt/properties.apt trunk/mavenpom4labs/src/site/en/apt/properties.apt trunk/mavenpom4labs/src/site/site_en.xml trunk/mavenpom4labs/src/site/site_fr.xml trunk/mavenpom4redmine/src/site/site_en.xml trunk/mavenpom4redmine/src/site/site_fr.xml trunk/pom.xml trunk/src/site/apt/properties.apt trunk/src/site/en/apt/properties.apt trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: - Evolution #277: add scmwebeditorEnabled to add (or not) scmwebeditor links in generated site - Evolution #278: Sitemap link is generated by maven-nuiton-skin - Evolution #282: Sign with pgp artifacts to deploy - do not generate english documentation, since it is not ready Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/mavenpom4labs/pom.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -97,6 +97,9 @@ <platform>labs.libre-entreprise.org</platform> + <!-- disable scmwebeditor in generated site --> + <scmwebeditorEnabled>false</scmwebeditorEnabled> + </properties> <packaging>pom</packaging> @@ -144,6 +147,10 @@ <properties> <platform>nuiton.org</platform> + + <!-- enable scmwebeditor in generated site --> + <scmwebeditorEnabled>true</scmwebeditorEnabled> + </properties> <distributionManagement> Modified: trunk/mavenpom4labs/src/site/apt/properties.apt =================================================================== --- trunk/mavenpom4labs/src/site/apt/properties.apt 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/mavenpom4labs/src/site/apt/properties.apt 2010-01-26 20:12:50 UTC (rev 817) @@ -39,15 +39,17 @@ Vue d'ensemble -*-----------------------+------------------------------------------------------+ -| <<propriété>> | <<valeur par défaut>> | -*-----------------------+------------------------------------------------------+ -| {{platform}} | <<labs.libre-entreprise.org>> | -*-----------------------+------------------------------------------------------+ -| {{labs.id}} | - | -*-----------------------+------------------------------------------------------+ -| {{labs.list.host}} | lists.${platform} | -*-----------------------+------------------------------------------------------+ +*-------------------------+----------------------------------------------------+ +| <<propriété>> | <<valeur par défaut>> | +*-------------------------+----------------------------------------------------+ +| {{platform}} | <<labs.libre-entreprise.org>> | +*-------------------------+----------------------------------------------------+ +| {{labs.id}} | - | +*-------------------------+----------------------------------------------------+ +| {{labs.list.host}} | lists.${platform} | +*-------------------------+----------------------------------------------------+ +| {{scmwebeditorEnabled}} | <<false>> | +*-------------------------+----------------------------------------------------+ Détails @@ -69,7 +71,7 @@ -------------------------------------------------------------------------------- https://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=browse -------------------------------------------------------------------------------- - + * {labs.list.host} Le nom du serveur des listes de diffusion (sur la labs) du projet. @@ -82,4 +84,10 @@ lists.labs.libre-entreprise.org -------------------------------------------------------------------------------- - <Note:> en théorie, cette propriété ne doit pas être modifiée. \ No newline at end of file + <Note:> en théorie, cette propriété ne doit pas être modifiée. + + +* {scmwebeditorEnabled} + + On désactive toujours la génération des liens vers scmwebeditor pour les + sites maven car tous les projets hébergés sur le labs utilisent un svn + ssh. \ No newline at end of file Modified: trunk/mavenpom4labs/src/site/en/apt/properties.apt =================================================================== --- trunk/mavenpom4labs/src/site/en/apt/properties.apt 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/mavenpom4labs/src/site/en/apt/properties.apt 2010-01-26 20:12:50 UTC (rev 817) @@ -33,15 +33,17 @@ Overview -*----------------------------------------------+--------------------------------------------------------+ -| <<property>> | <<Default- value>> | -*----------------------------------------------+--------------------------------------------------------+ -| {{platform}} | <<labs.libre-entreprise.org>> | -*----------------------------------------------+--------------------------------------------------------+ -| {{labs.id}} | - | -*----------------------------------------------+--------------------------------------------------------+ -| {{labs.list.host}} | lists.${platform} | -*----------------------------------------------+--------------------------------------------------------+ +*----------------------------+-------------------------------------------------+ +| <<property>> | <<Default- value>> | +*----------------------------+-------------------------------------------------+ +| {{platform}} | <<labs.libre-entreprise.org>> | +*----------------------------+-------------------------------------------------+ +| {{labs.id}} | - | +*----------------------------+-------------------------------------------------+ +| {{labs.list.host}} | lists.${platform} | +*----------------------------+-------------------------------------------------+ +| {{scmwebeditorEnabled}} | <<false>> | +*----------------------------+-------------------------------------------------+ Details @@ -55,4 +57,9 @@ * {labs.list.host} - host of any mailing lists for a labs project \ No newline at end of file + host of any mailing lists for a labs project + +* {scmwebeditorEnabled} + + always desactivate generation of scmwebeditor in maven sites, since all + projects hosted on labs use svn + ssh. Modified: trunk/mavenpom4labs/src/site/site_en.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_en.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/mavenpom4labs/src/site/site_en.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -52,7 +52,6 @@ <menu name="Divers"> <item name="Version française" href="/../index.html"/> - <item name="Site map" href="./en/sitemap.html"/> </menu> <menu ref="reports"/> Modified: trunk/mavenpom4labs/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/mavenpom4labs/src/site/site_fr.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -46,10 +46,9 @@ <item name="Faire une release" href="release.html"/> </menu> - <menu name="Divers"> + <!--menu name="Divers"> <item name="English version" href="/en/index.html"/> - <item name="Site map" href="./sitemap.html"/> - </menu> + </menu--> <menu ref="reports"/> Modified: trunk/mavenpom4redmine/src/site/site_en.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/mavenpom4redmine/src/site/site_en.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -56,7 +56,6 @@ <menu name="Divers"> <item name="Version française" href="/../index.html"/> - <item name="Site map" href="./en/sitemap.html"/> </menu> <menu ref="reports"/> Modified: trunk/mavenpom4redmine/src/site/site_fr.xml =================================================================== --- trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/mavenpom4redmine/src/site/site_fr.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -46,10 +46,9 @@ <item name="Faire une release" href="release.html"/> </menu> - <menu name="Divers"> + <!--menu name="Divers"> <item name="English version" href="/en/index.html"/> - <item name="Site map" href="./sitemap.html"/> - </menu> + </menu--> <menu ref="reports"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/pom.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -260,12 +260,12 @@ <!-- default documentation format (if not rst, change it)--> <siteSourcesType>rst</siteSourcesType> - <!-- default locale used in site generation --> - <defaultLocale>fr</defaultLocale> - <!-- scmwebeditor url --> <scmwebeditorUrl>http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor</scmwebeditorUrl> + <!-- enable or disable scmwebeditor in generated site --> + <scmwebeditorEnabled>true</scmwebeditorEnabled> + <!-- le fichier de license du projet --> <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> @@ -306,7 +306,7 @@ <jredmine.version>1.1.3</jredmine.version> <license.version>2.0.2</license.version> <jrst.version>1.1.0</jrst.version> - <skin.version>1.0.2</skin.version> + <skin.version>1.0.3-SNAPSHOT</skin.version> <!-- release repository url (to be used in site.xml) --> <repository.home.url>http://maven.nuiton.org/release</repository.home.url> @@ -583,8 +583,14 @@ <artifactId>plexus-component-metadata</artifactId> <version>1.5.2</version> </plugin> - + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.22</version> + </plugin> + + <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> @@ -901,12 +907,12 @@ <profile> <id>release-sign-artifacts</id> <!-- uncomment this when pgp key will be ok --> - <!--activation> + <activation> <property> <name>performRelease</name> <value>true</value> </property> - </activation--> + </activation> <build> <plugins> <plugin> @@ -1265,7 +1271,8 @@ <properties> <projectId>mavenpom</projectId> - <siteLocales>fr,en</siteLocales> + <!-- TODO use this when english documentation will be ok --> + <!--<siteLocales>fr,en</siteLocales>--> <siteSourcesType>apt</siteSourcesType> <!-- must fail if redmine actions failed --> Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/apt/properties.apt 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/src/site/apt/properties.apt 2010-01-26 20:12:50 UTC (rev 817) @@ -61,8 +61,10 @@ *----------------------------------------------+--------------------------------------------------------+ | {{siteLocales}} | <<fr>> | *----------------------------------------------+--------------------------------------------------------+ -| {{siteSourcesType}} | <<rst>> | +| {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ +| {{scmwebeditorEnabled}} | <<true>> | +*----------------------------------------------+--------------------------------------------------------+ | {{scmwebeditorUrl}} | <<http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor>>| *----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | @@ -189,6 +191,11 @@ Le type de fichiers utilisé pour écrire la documentation du site (<<apt>> ou <<rst>>) (par défaut <<rst>>) +* {scmwebeditorEnabled} + + Pour activer (ou déasactiver) la génération des liens scmwebeditors dans les sites + générés. (Par exemple, on ne peut pas gérer ces liens sur un svn ssh...) + * {scmwebeditorUrl} L'url de l'application scmwebeditor qui permet d'éditer le site en ligne. Modified: trunk/src/site/en/apt/properties.apt =================================================================== --- trunk/src/site/en/apt/properties.apt 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/src/site/en/apt/properties.apt 2010-01-26 20:12:50 UTC (rev 817) @@ -58,11 +58,11 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.test.gen.dir}} | <<${\project.build.directory}/test-generated-sources>> | *----------------------------------------------+--------------------------------------------------------+ -| {{siteLocales}} | <<fr>> | +| {{siteLocales}} | <<fr>> | *----------------------------------------------+--------------------------------------------------------+ | {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ -| {{defaultLocale}} | <<fr>> | +| {{scmwebeditorEnabled}} | <<true>> | *----------------------------------------------+--------------------------------------------------------+ | {{scmwebeditorUrl}} | <<http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor>>| *----------------------------------------------+--------------------------------------------------------+ @@ -184,11 +184,11 @@ Type of files used to write the site documentation (<<apt>> ou <<rst>>) (by default <<rst>>) +* {scmwebeditorEnabled} -* {defaultLocale} + To enable (ou disable) generation of scmwebeditor links in maven sites. + (for example, can not use scmwebeditor with ssh svn) - Default locale used in site (used by scmwebeditor) (this is the first locale of {{siteLocales}}). - * {scmwebeditorUrl} Url of scmwebeditor application. Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/src/site/site_en.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -80,7 +80,6 @@ <menu name="Divers"> <item name="Version française" href="/../index.html"/> - <item name="Site map" href="./en/sitemap.html"/> </menu> <menu ref="reports"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-25 00:02:53 UTC (rev 816) +++ trunk/src/site/site_fr.xml 2010-01-26 20:12:50 UTC (rev 817) @@ -73,10 +73,9 @@ </menu> - <menu name="Divers"> + <!--menu name="Divers"> <item name="English version" href="/en/index.html"/> - <item name="Site map" href="./sitemap.html"/> - </menu> + </menu--> <menu ref="reports"/>