r327 - in maven-jrst-plugin/trunk: . src/site src/site/rst - Jrst-commits

11 May 2009

Author: tchemit
Date: 2009-05-11 06:12:51 +0000 (Mon, 11 May 2009)
New Revision: 327

Added:
   maven-jrst-plugin/trunk/src/site/rst/
   maven-jrst-plugin/trunk/src/site/rst/index.rst
   maven-jrst-plugin/trunk/src/site/site.xml
Removed:
   maven-jrst-plugin/trunk/src/site/site_fr.xml
Modified:
   maven-jrst-plugin/trunk/changelog.txt
   maven-jrst-plugin/trunk/pom.xml
   maven-jrst-plugin/trunk/src/site/site_en.xml
Log:
  * bump versions (lutinproject, lutinutil, jrst, maven-i18n-plugin, maven-license-switcher-plugin)
  * use doxia-modules-jrst instead of maven-jrst-plugin
  * improve download section on site

Modified: maven-jrst-plugin/trunk/changelog.txt
===================================================================

--- maven-jrst-plugin/trunk/changelog.txt	2009-05-11 06:12:34 UTC (rev 326)
+++ maven-jrst-plugin/trunk/changelog.txt	2009-05-11 06:12:51 UTC (rev 327)
@@ -1,3 +1,11 @@
+ver 1.0.0 ?
+  * migrate to org.nuiton groupId
+
+ver 0.8.6 chemit 20090511
+  * bump versions (lutinproject, lutinutil, jrst, maven-i18n-plugin, maven-license-switcher-plugin)
+  * use doxia-modules-jrst instead of maven-jrst-plugin
+  * improve download section on site
+
 ver-0.8.5 chemit 20090409
  * follow jrst version
 

Modified: maven-jrst-plugin/trunk/pom.xml
===================================================================
--- maven-jrst-plugin/trunk/pom.xml	2009-05-11 06:12:34 UTC (rev 326)
+++ maven-jrst-plugin/trunk/pom.xml	2009-05-11 06:12:51 UTC (rev 327)
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.codelutin</groupId>
         <artifactId>lutinproject</artifactId>
-       <version>3.4</version>
+       <version>3.5.4</version>
     </parent>
 
     <artifactId>maven-jrst-plugin</artifactId>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.codelutin</groupId>
             <artifactId>jrst</artifactId>
-            <version>0.8.5</version>
+            <version>0.8.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -69,7 +69,7 @@
         <!-- Site en et fr -->
         <maven.site.locales>fr,en</maven.site.locales>
 
-        <lutinpluginutil.version>0.3</lutinpluginutil.version>
+        <lutinpluginutil.version>0.5</lutinpluginutil.version>
         
         <maven.version>2.0.10</maven.version>
     </properties>
@@ -82,8 +82,7 @@
 
             <!-- plugin plugin -->
             <plugin>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>2.4.3</version>
+                <artifactId>maven-plugin-plugin</artifactId>                
                 <executions>
                     <execution>
                         <goals>
@@ -94,7 +93,7 @@
             </plugin>
 
             <!-- Always process jrst files, but only called on pre-site phase -->
-            <plugin>
+            <!--plugin>
                 <groupId>org.codelutin</groupId>
                 <artifactId>maven-jrst-plugin</artifactId>
                 <version>0.8.5</version>
@@ -113,10 +112,25 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin-->
 
         </plugins>
 
+        <pluginManagement>
+            <plugins>
+                 <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codelutin</groupId>
+                            <artifactId>doxia-module-jrst</artifactId>
+                            <version>1.0.1</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
     </build>
 
     <!--Site-->
@@ -172,10 +186,7 @@
                     <plugin>
                         <groupId>org.codelutin</groupId>
                         <artifactId>maven-license-switcher-plugin</artifactId>
-                        <version>0.6</version>
-                        <configuration>
-                            <licenseName>${license-switcher.licenseName}</licenseName>
-                        </configuration>
+                        <version>0.8</version>
                         <executions>
                             <execution>
                                 <id>attach-licenses</id>

Copied: maven-jrst-plugin/trunk/src/site/rst/index.rst (from rev 312, maven-jrst-plugin/trunk/src/site/fr/rst/index.rst)
===================================================================
--- maven-jrst-plugin/trunk/src/site/rst/index.rst	                        (rev 0)
+++ maven-jrst-plugin/trunk/src/site/rst/index.rst	2009-05-11 06:12:51 UTC (rev 327)
@@ -0,0 +1,103 @@
+Accueil
+=======
+
+.. contents::
+
+Présentation
+------------
+
+Le plugin maven2 pour utiliser la librairie jrst.
+
+Fonctionnement
+--------------
+
+Maven ne gère pas le RST par défaut, voilà pourquoi le plugin
+maven-jrst-plugin a été développé.
+
+Il utilise donc une structure similaire des sources des sites
+maven, mais les transforme en xdoc, et passe ensuite le relai
+à maven.
+
+Le pom, doit doit être configuré pour :
+  - demander la génération des fichiers xdoc
+  - changer le répertoire par défaut des sources du site
+
+
+Configuration du pom
+--------------------
+
+pre-site : maven-jrst-plugin
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+  <plugin>
+        <groupId>org.codelutin</groupId>
+        <artifactId>maven-jrst-plugin</artifactId>
+        <version>${maven-jrst-plugin.version}</version>
+        <configuration>
+            <directoryIn>${basedir}/src/site</directoryIn>
+            <directoryOut>${project.build.directory}/generated-site</directoryOut>
+            <defaultLocale>fr</defaultLocale>
+            <inputEncoding>UTF-8</inputEncoding>
+            <outputEncoding>UTF-8</outputEncoding>
+        </configuration>
+        <executions>
+            <execution>
+                <phase>pre-site</phase>
+                <goals>
+                    <goal>jrst</goal>
+                </goals>
+            </execution>
+        </executions>
+  </plugin>
+
+
+pre-site : maven-antrun-plugin
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ce plugin est utilisé pour copier les fichiers "non-rst"
+dans le répertoire de génération de site.
+
+::
+
+  <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+            <execution>
+                <phase>pre-site</phase>
+                <configuration>
+                    <tasks>
+                        <mkdir dir="${basedir}/src/site"/>
+                        <copy todir="${project.build.directory}/generated-site" 
+                              verbose="${maven.verbose}"
+                              overwrite="false">
+                            <fileset dir="${basedir}/src/site">
+                                <exclude name="**/rst/**"/>
+                            </fileset>
+                        </copy>
+                    </tasks>
+                </configuration>
+                <goals>
+                    <goal>run</goal>
+                </goals>
+            </execution>
+        </executions>
+  </plugin>
+
+
+site : maven-site-plugin
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+::
+
+  <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+           <siteDirectory>${project.build.directory}/generated-site</siteDirectory>
+           <inputEncoding>UTF-8</inputEncoding>
+           <outputEncoding>UTF-8</outputEncoding>
+           <generateReports>true</generateReports>
+           <locales>fr,en</locales>
+        </configuration>
+  </plugin>
\ No newline at end of file


Property changes on: maven-jrst-plugin/trunk/src/site/rst/index.rst
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: maven-jrst-plugin/trunk/src/site/site.xml (from rev 312, maven-jrst-plugin/trunk/src/site/site_fr.xml)
===================================================================
--- maven-jrst-plugin/trunk/src/site/site.xml	                        (rev 0)
+++ maven-jrst-plugin/trunk/src/site/site.xml	2009-05-11 06:12:51 UTC (rev 327)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="${project.name}">
+
+    <publishDate format="dd/MM/yyyy"/>
+
+    <skin>
+      <groupId>org.codelutin</groupId>
+      <artifactId>maven-lutin-skin</artifactId>
+      <version>0.2.3</version>
+    </skin>
+
+    <bannerLeft>
+        <name>${project.name}</name>
+        <href>/</href>
+    </bannerLeft>
+
+    <bannerRight>
+        <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
+        <href>${project.organization.url}</href>
+    </bannerRight>
+
+    <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>
+
+    <body>
+        <links>
+            <item name="jrst" href="http://jrst.labs.libre-entreprise.org/jrst/"/>
+            <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/>
+            <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="${project.organization.name}" href="${project.organization.url}"/>
+            <item name="[fr" href="index.html"/>
+            <item name="en]" href="en/index.html"/>
+        </links>
+
+        <menu name="Utilisateur">
+            <item name="Accueil" href="index.html"/>
+            <item name="Détail des goals" href="plugin-info.html">
+                <item name="jrst:jrst" href="jrst-mojo.html"/>
+                <item name="jrst:help" href="help-mojo.html"/>
+            </item>
+        </menu>
+        
+        <menu name="Téléchargement">
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+                  name="Librairie (jar)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+                  name="Javadoc (jar)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+                  name="Sources (jar)"/>
+        </menu>
+
+        <menu ref="reports"/>
+    </body>
+</project>

Modified: maven-jrst-plugin/trunk/src/site/site_en.xml
===================================================================
--- maven-jrst-plugin/trunk/src/site/site_en.xml	2009-05-11 06:12:34 UTC (rev 326)
+++ maven-jrst-plugin/trunk/src/site/site_en.xml	2009-05-11 06:12:51 UTC (rev 327)
@@ -26,14 +26,14 @@
 
     <body>
         <links>
+            <item name="jrst" href="http://jrst.labs.libre-entreprise.org/jrst/en"/>
+            <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/>
             <item name="Labs" href="http://labs.libre-entreprise.org/"/>
             <item name="${project.organization.name}" href="${project.organization.url}"/>
             <item name="[fr" href="../index.html"/>
             <item name="en]" href="index.html"/>
         </links>
 
-        <!--menu ref="parent"/ -->
-
         <menu name="Users">
             <item name="Home" href="index.html"/>
             <item name="Goals" href="plugin-info.html">
@@ -43,16 +43,14 @@
         </menu>
         
         <menu name="Download">
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}"
-                  name="Last version"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}"
-                  name="All versions"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+                  name="Librairy (jar)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+                  name="Javadoc (jar)"/>
+            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+                  name="Sources (jar)"/>
         </menu>
 
-        <!--menu name="Developper">
-            <item name="TODO" href="Todo.html"/>
-        </menu-->
-
         <menu ref="reports"/>
 
     </body>

Deleted: maven-jrst-plugin/trunk/src/site/site_fr.xml
===================================================================
--- maven-jrst-plugin/trunk/src/site/site_fr.xml	2009-05-11 06:12:34 UTC (rev 326)
+++ maven-jrst-plugin/trunk/src/site/site_fr.xml	2009-05-11 06:12:51 UTC (rev 327)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="${project.name}">
-
-    <publishDate format="dd/MM/yyyy"/>
-
-    <skin>
-      <groupId>org.codelutin</groupId>
-      <artifactId>maven-lutin-skin</artifactId>
-      <version>0.2.3</version>
-    </skin>
-
-    <bannerLeft>
-        <name>${project.name}</name>
-        <href>/</href>
-    </bannerLeft>
-
-    <bannerRight>
-        <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src>
-        <href>${project.organization.url}</href>
-    </bannerRight>
-
-    <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>
-
-    <body>
-        <links>
-            <item name="Labs" href="http://labs.libre-entreprise.org/"/>
-            <item name="${project.organization.name}" href="${project.organization.url}"/>
-            <item name="[fr" href="index.html"/>
-            <item name="en]" href="en/index.html"/>
-        </links>
-
-        <!--menu ref="parent"/ -->
-
-        <menu name="Utilisateur">
-            <item name="Accueil" href="index.html"/>
-            <item name="Détail des goals" href="plugin-info.html">
-                <item name="jrst:jrst" href="jrst-mojo.html"/>
-                <item name="jrst:help" href="help-mojo.html"/>
-            </item>
-        </menu>
-        
-        <menu name="Téléchargement">
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}"
-                  name="Dernière version"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}"
-                  name="Toutes les versions"/>
-        </menu>
-
-        <!--menu name="Développeur">
-            <item name="A faire" href="Todo.html"/>
-        </menu-->
-
-        <menu ref="reports"/>
-
-    </body>
-</project>

    

r327 - in maven-jrst-plugin/trunk: . src/site src/site/rst

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)