May 2009 - Jrst-commits - mailman.cloud.codelutin.com

r327 - in maven-jrst-plugin/trunk: . src/site src/site/rst
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 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 @@  <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> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> + <artifactId>maven-plugin-plugin</artifactId> <executions> <execution> <goals> @@ -94,7 +93,7 @@ </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>  @@ -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 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 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 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 ref="reports"/> - - </body> -</project>

1 0

r326 - maven-jrst-plugin/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 06:12:34 +0000 (Mon, 11 May 2009) New Revision: 326 Removed: maven-jrst-plugin/trunk/src/site/fr/ 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

1 0

r325 - doxia-module-jrst/trunk
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 06:06:39 +0000 (Mon, 11 May 2009) New Revision: 325 Modified: doxia-module-jrst/trunk/pom.xml Log: push back scm generic values Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-05-11 06:02:39 UTC (rev 324) +++ doxia-module-jrst/trunk/pom.xml 2009-05-11 06:06:39 UTC (rev 325) @@ -117,9 +117,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/doxia-module-jr…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>

1 0

r324 - doxia-module-jrst/trunk
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 06:02:39 +0000 (Mon, 11 May 2009) New Revision: 324 Modified: doxia-module-jrst/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-05-11 06:02:36 UTC (rev 323) +++ doxia-module-jrst/trunk/pom.xml 2009-05-11 06:02:39 UTC (rev 324) @@ -14,7 +14,7 @@ </parent> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.1</version> + <version>1.1.0-SNAPSHOT</version> <dependencies> <dependency> @@ -117,9 +117,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/tags/1.0.1</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/tags/1.0.1</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/doxia-module-jr…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/doxia-module-jr…</url> </scm>

1 0

r323 - doxia-module-jrst/tags
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 06:02:36 +0000 (Mon, 11 May 2009) New Revision: 323 Added: doxia-module-jrst/tags/1.0.1/ Log: [maven-scm] copy for tag 1.0.1 Copied: doxia-module-jrst/tags/1.0.1 (from rev 322, doxia-module-jrst/trunk)

1 0

r322 - doxia-module-jrst/trunk
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 06:02:31 +0000 (Mon, 11 May 2009) New Revision: 322 Modified: doxia-module-jrst/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.0.1 Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-05-11 05:58:55 UTC (rev 321) +++ doxia-module-jrst/trunk/pom.xml 2009-05-11 06:02:31 UTC (rev 322) @@ -14,7 +14,7 @@ </parent> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <dependencies> <dependency> @@ -117,9 +117,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/tags/1.0.1</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/doxia-module-jrst/tags/1.0.1</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/doxia-module-jr…</url> </scm>

1 0

r321 - doxia-module-jrst/trunk
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 05:58:55 +0000 (Mon, 11 May 2009) New Revision: 321 Modified: doxia-module-jrst/trunk/pom.xml Log: add license-switcher-plugin Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-05-11 05:57:17 UTC (rev 320) +++ doxia-module-jrst/trunk/pom.xml 2009-05-11 05:58:55 UTC (rev 321) @@ -138,4 +138,40 @@ </releases> </repository> </repositories> + +  + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.8</version> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> </project> \ No newline at end of file

1 0

r320 - in doxia-module-jrst/trunk: . src/main/java/org/codelutin/jrst src/site src/test/java/org/codelutin/jrst
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 05:57:17 +0000 (Mon, 11 May 2009) New Revision: 320 Modified: doxia-module-jrst/trunk/changelog.txt doxia-module-jrst/trunk/pom.xml doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java doxia-module-jrst/trunk/src/site/site.xml doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java Log: * Bump versions (lutinproject 3.5.4, jrst 0.8.6) * add Override annotations Modified: doxia-module-jrst/trunk/changelog.txt =================================================================== --- doxia-module-jrst/trunk/changelog.txt 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/changelog.txt 2009-05-11 05:57:17 UTC (rev 320) @@ -1,3 +1,11 @@ +doxia-module-jrst (1.1.0) ? + + * migrate to nuiton + +doxia-module-jrst (1.0.1) chemit 20090511 + + * Bump versions (lutinproject 3.5.4, jrst 0.8.6) + doxia-module-jrst (1.0.0) chemit * Initial release \ No newline at end of file Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/pom.xml 2009-05-11 05:57:17 UTC (rev 320) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.4</version> </parent> <artifactId>doxia-module-jrst</artifactId> @@ -26,7 +26,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>jrst</artifactId> - <version>0.8.5</version> + <version>0.8.6</version> <scope>compile</scope> <exclusions> <exclusion> @@ -35,13 +35,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <type>test-jar</type> - <version>${doxia.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <type>test-jar</type> + <version>${doxia.version}</version> + <scope>test</scope> + </dependency> </dependencies>  @@ -93,10 +93,10 @@ </descriptors> </configuration> <executions> - <execution> + <execution> <goals> - <goal>descriptor</goal> - <goal>merge-descriptors</goal> + <goal>descriptor</goal> + <goal>merge-descriptors</goal> </goals> </execution> </executions> @@ -104,7 +104,7 @@ </plugins> </build> - <reporting> + <reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java =================================================================== --- doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java 2009-05-11 05:57:17 UTC (rev 320) @@ -41,7 +41,7 @@ protected final static String RST2XDOC = "/xsl/rst2xdoc.xsl"; - /** {@inheritDoc} */ + @Override public void parse(Reader source, Sink sink) throws ParseException { try { Modified: doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java =================================================================== --- doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java 2009-05-11 05:57:17 UTC (rev 320) @@ -29,17 +29,17 @@ */ public class JrstSiteModule extends AbstractSiteModule { - /** {@inheritDoc} */ + @Override public String getSourceDirectory() { return "rst"; } - /** {@inheritDoc} */ + @Override public String getExtension() { return "rst"; } - /** {@inheritDoc} */ + @Override public String getParserId() { return "jrst"; } Modified: doxia-module-jrst/trunk/src/site/site.xml =================================================================== --- doxia-module-jrst/trunk/src/site/site.xml 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/site/site.xml 2009-05-11 05:57:17 UTC (rev 320) @@ -26,10 +26,11 @@ <body> <links> <item name="JRst" href="http://jrst.labs.libre-entreprise.org/"/> + <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/maven-jrst-plugin/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> - <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/> - <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/> +  </links> <menu name="User"> Modified: doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java =================================================================== --- doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java 2009-05-11 05:57:17 UTC (rev 320) @@ -33,14 +33,14 @@ protected JrstParser parser; - /** @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); parser = (JrstParser) lookup(Parser.ROLE, "jrst"); } - /** @see org.apache.maven.doxia.parser.AbstractParserTest#createParser() */ + @Override protected Parser createParser() { return parser; } @@ -54,7 +54,7 @@ output = new StringWriter(); reader = getTestReader("test", "rst"); - Sink sink = new XdocSink(output); + Sink sink = new XdocSink(output) {}; createParser().parse(reader, sink); /* FIXME output is null :( @@ -68,7 +68,7 @@ } } - /** {@inheritDoc} */ + @Override protected String outputExtension() { return "rst"; }

1 0

r319 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 05:35:52 +0000 (Mon, 11 May 2009) New Revision: 319 Modified: jrst/trunk/pom.xml Log: push back scm generic values Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-05-11 05:15:18 UTC (rev 318) +++ jrst/trunk/pom.xml 2009-05-11 05:35:52 UTC (rev 319) @@ -265,9 +265,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/trunk/?roo…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>

1 0

r318 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org May 11, 2009

May 11, 2009

Author: tchemit Date: 2009-05-11 05:15:18 +0000 (Mon, 11 May 2009) New Revision: 318 Modified: jrst/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-05-11 05:15:15 UTC (rev 317) +++ jrst/trunk/pom.xml 2009-05-11 05:15:18 UTC (rev 318) @@ -14,7 +14,7 @@ </parent> <artifactId>jrst</artifactId> - <version>0.8.6</version> + <version>1.0.0-SNAPSHOT</version> <dependencies> <dependency> @@ -265,9 +265,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.6</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.6</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/tags/0.8.6…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/trunk/?roo…</url> </scm>

1 0