Author: tchemit Date: 2009-11-25 00:02:27 +0100 (Wed, 25 Nov 2009) New Revision: 703 Added: trunk/src/site/apt/ Removed: trunk/src/site/fr/ Modified: 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: - add scmwebeditorUrl and defaultLocale property - go back to classic maven-site-plugin since We can deal with maven site directory layout in scmwebeditor now - site is going back to classic directory layout... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/pom.xml 2009-11-24 23:02:27 UTC (rev 703) @@ -212,6 +212,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> + <!-- le fichier de license du projet --> <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> @@ -431,15 +437,15 @@ <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0.1-cl_20091107</version> - <!--<version>2.0.1</version>--> + <!--<version>2.0.1-cl_20091107</version>--> + <version>2.0.1</version> <configuration> <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> <locales>${maven.site.locales}</locales> <!-- generate symetric site for any locale (no default locale at root) --> - <symetricLayout>true</symetricLayout> + <!--<symetricLayout>true</symetricLayout>--> </configuration> <dependencies> <dependency> @@ -1479,7 +1485,7 @@ <redmine.releaseFiles>src/site/site_fr.xml,src/site/site_en.xml</redmine.releaseFiles> </properties> - <build> + <!--build> <plugins> <plugin> <groupId>org.nuiton</groupId> @@ -1497,9 +1503,35 @@ </executions> </plugin> </plugins> - </build> + </build--> </profile> + <profile> + <id>testSCM</id> + <properties> + <scmwebeditorUrl>http://localhost:8080/scmwebeditor-0.0.1-SNAPSHOT/scmwebeditor</scmwebeditorUrl> + </properties> + <!--build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>generate-site-index</id> + <goals> + <goal>generate-site-index</goal> + </goals> + <configuration> + <locales>${maven.site.locales}</locales> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build--> + </profile> + <!--<profile> <id>reporting</id> <activation> Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/fr/apt/properties.apt 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/apt/properties.apt 2009-11-24 23:02:27 UTC (rev 703) @@ -41,6 +41,10 @@ *----------------------------------------------+--------------------------------------------------------+ | {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ +| {{defaultLocale}} | <<fr>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{scmwebeditorUrl}} | <<http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor>>| +*----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.test.testFailureIgnore}} | <<false>> | @@ -180,6 +184,14 @@ Le type de fichiers utilisé pour écrire la documentation du site (<<apt>> ou <<rst>>) (par défaut <<rst>>) +* {defaultLocale} + + La locale par défaut à utiliser dans les sites générés (utilisé par scmwebeditor) (il s'agit de la première locale de {{maven.site.locales}}).. + +* {scmwebeditorUrl} + + L'url de l'application scmwebeditor. + * {maven.license.file} Chemin vers la license utilisée dans le projet Modified: trunk/src/site/en/apt/properties.apt =================================================================== --- trunk/src/site/en/apt/properties.apt 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/en/apt/properties.apt 2009-11-24 23:02:27 UTC (rev 703) @@ -38,8 +38,12 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.site.locales}} | <<fr>> | *----------------------------------------------+--------------------------------------------------------+ -| {{siteSourcesType}} | <<rst>> | +| {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ +| {{defaultLocale}} | <<fr>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{scmwebeditorUrl}} | <<http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor>>| +*----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.test.testFailureIgnore}} | <<false>> | @@ -177,6 +181,15 @@ Type of files used to write the site documentation (<<apt>> ou <<rst>>) (by default <<rst>>) + +* {defaultLocale} + + Default locale used in site (used by scmwebeditor) (this is the first locale of {{maven.site.locales}}). + +* {scmwebeditorUrl} + + Url of scmwebeditor application. + * {maven.license.file} Path to license file Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/site_en.xml 2009-11-24 23:02:27 UTC (rev 703) @@ -45,7 +45,7 @@ </menu> <menu name="Links"> - <item name="mavenpom (french)" href="../fr/index.html"/> + <item name="mavenpom (french)" href="../index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-11-24 16:44:47 UTC (rev 702) +++ trunk/src/site/site_fr.xml 2009-11-24 23:02:27 UTC (rev 703) @@ -45,7 +45,7 @@ </menu> <menu name="Liens"> - <item name="mavenpom (english)" href="../en/index.html"/> + <item name="mavenpom (english)" href="/en/index.html"/> <item name="maven-nuiton-skin" href="http://maven-site.nuiton.org/maven-nuiton-skin"/> <item name="maven-helper-plugin" href="http://maven-site.nuiton.org/maven-helper-plugin"/> <item name="maven-jredmine-plugin" href="http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin"/>