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

r459 - in trunk: . doxia-module-jrst doxia-module-jrst/src/site jrst/src/site jrst-doc jrst-doc/src/site maven-jrst-plugin maven-jrst-plugin/src/site src/site src/site/apt src/site/en src/site/en/apt
by tchemit＠users.nuiton.org 15 Apr '10

15 Apr '10

Author: tchemit Date: 2010-04-15 19:53:31 +0200 (Thu, 15 Apr 2010) New Revision: 459 Log: - Evolution #530: Use junit 4.8.1 - Evolution #528: Use mavenpom4redmine 2.1.1 - Anomalie #531: Make site working in multi-module Added: trunk/src/site/apt/ trunk/src/site/apt/index.apt trunk/src/site/en/ trunk/src/site/en/apt/ trunk/src/site/en/apt/index.apt trunk/src/site/site_fr.xml Removed: trunk/src/site/site.xml Modified: trunk/doxia-module-jrst/pom.xml trunk/doxia-module-jrst/src/site/site_en.xml trunk/doxia-module-jrst/src/site/site_fr.xml trunk/jrst-doc/pom.xml trunk/jrst-doc/src/site/site_en.xml trunk/jrst-doc/src/site/site_fr.xml trunk/jrst/src/site/site_en.xml trunk/jrst/src/site/site_fr.xml trunk/maven-jrst-plugin/pom.xml trunk/maven-jrst-plugin/src/site/site_en.xml trunk/maven-jrst-plugin/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/doxia-module-jrst/pom.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -36,9 +36,16 @@ <artifactId>doxia-module-xdoc</artifactId> </dependency> + <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> <type>test-jar</type> </dependency> Modified: trunk/doxia-module-jrst/src/site/site_en.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_en.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/doxia-module-jrst/src/site/site_en.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,28 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - <menu name="User"> - <item href="/index.html" name="About"/> - </menu> + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> - <menu name="Developer"> - <item href="/devel.html" name="Documentation"/> - </menu> + <body> - <menu ref="reports"/> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - </body> + <links> + <item name="[fr" href="../index.html"/> + <item name="en]" href="index.html"/> + </links> + + <menu name="Project Parent"> + <item name="JRst" href="../../en/index.html"/> + </menu> + + <menu name="User"> + <item href="/index.html" name="About"/> + </menu> + + <menu name="Developer"> + <item href="/devel.html" name="Documentation"/> + </menu> + + <menu ref="reports"/> + + </body> </project> Modified: trunk/doxia-module-jrst/src/site/site_fr.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site_fr.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/doxia-module-jrst/src/site/site_fr.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,28 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - <menu name="User"> - <item href="/index.html" name="About"/> - </menu> + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> - <menu name="Developer"> - <item href="/devel.html" name="Documentation"/> - </menu> + <body> - <menu ref="reports"/> + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> - </body> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="en/index.html"/> + </links> + + <menu ref="parent"/> + + <menu name="User"> + <item href="/index.html" name="About"/> + </menu> + + <menu name="Developer"> + <item href="/devel.html" name="Documentation"/> + </menu> + + <menu ref="reports"/> + + </body> </project> Modified: trunk/jrst/src/site/site_en.xml =================================================================== --- trunk/jrst/src/site/site_en.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/jrst/src/site/site_en.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,29 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - - <bannerLeft> - <name>Java ReStructuredText parser</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - <menu name="Download"> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Library (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> + <bannerLeft> + <name>Java ReStructuredText parser</name> + <href>/</href> + </bannerLeft> - <menu ref="reports"/> + <body> - </body> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <links> + <item name="[fr" href="../index.html"/> + <item name="en]" href="index.html"/> + </links> + + <menu name="Project Parent"> + <item name="JRst" href="../../en/index.html"/> + </menu> + + <menu name="Download"> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Library (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> </project> Modified: trunk/jrst/src/site/site_fr.xml =================================================================== --- trunk/jrst/src/site/site_fr.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/jrst/src/site/site_fr.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,29 +1,37 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <bannerLeft> - <name>Java ReStructuredText parser</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> + <bannerLeft> + <name>Java ReStructuredText parser</name> + <href>/</href> + </bannerLeft> - <menu ref="parent"/> + <body> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu ref="reports"/> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="en/index.html"/> + </links> - </body> + <menu ref="parent"/> + + <menu name="Téléchargement"> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> </project> \ No newline at end of file Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/jrst-doc/pom.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -31,11 +31,29 @@ <properties> <maven.reports.generate>false</maven.reports.generate> + <siteSourcesType>rst</siteSourcesType> </properties> <build> - <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>default-site</id> + </execution> + </executions> + </plugin> + </plugins> +  </build> Modified: trunk/jrst-doc/src/site/site_en.xml =================================================================== --- trunk/jrst-doc/src/site/site_en.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/jrst-doc/src/site/site_en.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,37 +1,47 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <poweredBy> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> - </poweredBy> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> + <poweredBy> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" + img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> - <menu name="User"> - <item href="/user/index.html" name="About"/> - <item href="/user/RSTpresentation.html" name="A ReStructuredText Primer"/> - <item href="/user/functionality.html" name="Functionalities suggested"/> - </menu> + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> - <menu name="Developer"> - <item name="Documentation" href="/devel/developerDoc.html"/> - <item name="A XSL primer" href="/devel/XSLpresentation.html"/> - <item name="Librairy used" href="/devel/library.html"/> - <item name="Todo" href="/devel/Todo.html"/> - <item name="External documentation" href="/devel/externalDoc.html"/> - </menu> + <body> - </body> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <links> + <item name="[fr" href="../index.html"/> + <item name="en]" href="index.html"/> + </links> + + <menu name="Project Parent"> + <item name="JRst" href="../../en/index.html"/> + </menu> + + <menu name="User"> + <item href="/user/index.html" name="About"/> + <item href="/user/RSTpresentation.html" name="A ReStructuredText Primer"/> + <item href="/user/functionality.html" name="Functionalities suggested"/> + </menu> + + <menu name="Developer"> + <item name="Documentation" href="/devel/developerDoc.html"/> + <item name="A XSL primer" href="/devel/XSLpresentation.html"/> + <item name="Librairy used" href="/devel/library.html"/> + <item name="Todo" href="/devel/Todo.html"/> + <item name="External documentation" href="/devel/externalDoc.html"/> + </menu> + + </body> </project> Modified: trunk/jrst-doc/src/site/site_fr.xml =================================================================== --- trunk/jrst-doc/src/site/site_fr.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/jrst-doc/src/site/site_fr.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,37 +1,47 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <poweredBy> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> - </poweredBy> + <poweredBy> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" + img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> - <menu ref="parent"/> + <body> - <menu name="Utilisateur"> - <item href="/user/index.html" name="Présentation du JRST"/> - <item href="/user/presentationRST.html" name="Introduction à ReStructuredText"/> - <item href="/user/fonctionnalites.html" name="Fonctionnalités incluses"/> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu name="Developpeur"> - <item name="Fonctionnement" href="/devel/docDeveloppeur.html"/> - <item name="Presentation au XSL" href="/devel/presentationXSL.html"/> - <item name="Librairies utilisées" href="/devel/librairies.html"/> - <item name="Todo" href="/devel/Todo.html"/> - <item name="Documentation externe" href="/devel/docExterne.html"/> - </menu> - </body> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="en/index.html"/> + </links> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="/user/index.html" name="Présentation du JRST"/> + <item href="/user/presentationRST.html" + name="Introduction à ReStructuredText"/> + <item href="/user/fonctionnalites.html" name="Fonctionnalités incluses"/> + </menu> + + <menu name="Developpeur"> + <item name="Fonctionnement" href="/devel/docDeveloppeur.html"/> + <item name="Presentation au XSL" href="/devel/presentationXSL.html"/> + <item name="Librairies utilisées" href="/devel/librairies.html"/> + <item name="Todo" href="/devel/Todo.html"/> + <item name="Documentation externe" href="/devel/docExterne.html"/> + </menu> + + </body> </project> \ No newline at end of file Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/maven-jrst-plugin/pom.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -56,40 +56,62 @@  <packaging>maven-plugin</packaging> - <build> + <profiles> - <defaultGoal>install</defaultGoal> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> - </build> + </build> -  - <reporting> + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> - </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> + </plugin> </plugins> - </reporting> + </reporting> + </profile> + </profiles> + </project> Modified: trunk/maven-jrst-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-jrst-plugin/src/site/site_en.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/maven-jrst-plugin/src/site/site_en.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,37 +1,47 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> + <body> - <menu ref="parent"/> - - <menu name="Users"> - <item name="Home" href="index.html"/> - <item name="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="Download"> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Library (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu ref="reports"/> + <links> + <item name="[fr" href="../index.html"/> + <item name="en]" href="index.html"/> + </links> - </body> + <menu name="Project Parent"> + <item name="JRst" href="../../en/index.html"/> + </menu> + + <menu name="Users"> + <item name="Home" href="index.html"/> + <item name="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="Download"> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Library (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> </project> Modified: trunk/maven-jrst-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-jrst-plugin/src/site/site_fr.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/maven-jrst-plugin/src/site/site_fr.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,36 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> + <body> - <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="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu ref="reports"/> - </body> + + <links> + <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="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/pom.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <artifactId>jrst</artifactId> @@ -103,6 +103,21 @@ <artifactId>plexus-sec-dispatcher</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + </exclusions> </dependency> @@ -196,11 +211,19 @@ <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-xdoc</artifactId> <version>${doxia.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> <type>test-jar</type> <version>${doxia.version}</version> <scope>test</scope> @@ -209,7 +232,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> + <version>4.8.1</version> <scope>test</scope> </dependency> @@ -279,9 +302,10 @@ <projectId>jrst</projectId>  -  -  + <siteLocales>fr,en</siteLocales> + <siteSourcesType>apt</siteSourcesType> + <doxia.version>1.1.2</doxia.version> <nuiton-utils.version>1.2</nuiton-utils.version> <i18n.version>1.2.1</i18n.version> @@ -289,7 +313,7 @@ <build> - <defaultGoal>install</defaultGoal> +  <pluginManagement> <plugins> Added: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt (rev 0) +++ trunk/src/site/apt/index.apt 2010-04-15 17:53:31 UTC (rev 459) @@ -0,0 +1,17 @@ +---- +JRsT +---- + + TODO + + Les quatre modules du projet JRst : + + - {{{./jrst/index.html}JRst :: Api}} + + - {{{./maven-jrst-plugin/index.html}JRst :: Maven Plugin}} + + - {{{./ant-jrst-task/index.html}JRst :: Ant task}} + + - {{{./doxia-module-jrst/index.html}JRst :: Doxia module}} + + - {{{./jrst-doc/index.html}JRst :: Documentation}} Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt (rev 0) +++ trunk/src/site/en/apt/index.apt 2010-04-15 17:53:31 UTC (rev 459) @@ -0,0 +1,15 @@ +---- +JRsT +---- + + TODO + + The four JRst project modules : + + - {{{../jrst/en/index.html}JRst :: Api}} + + - {{{../maven-jrst-plugin/en/index.html}JRst :: Maven Plugin}} + + - {{{../doxia-module-jrst/en/index.html}JRst :: Doxia module}} + + - {{{../jrst-doc/en/index.html}JRst :: Documentation}} Property changes on: trunk/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/src/site/site.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - <links> - <item name="[fr" href="${project.url}/index.html"/> - <item name="en]" href="${project.url}/en/index.html"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="modules"/> - - <menu ref="reports"/> - </body> -</project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-04-15 10:57:39 UTC (rev 458) +++ trunk/src/site/site_en.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -1,27 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + </poweredBy> - <body> - <links> - <item name="[fr" href="${project.url}/index.html"/> - <item name="en]" href="${project.url}/en/index.html"/> - </links> + <body> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="modules"/> + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> +  + </links> - <menu ref="reports"/> - </body> + <menu name="Language"> + <item name="French" href="../index.html"/> + <item name="English" href="index.html"/> + </menu> + +  + + <menu name="Modules"> + <item name="JRst :: Api" href="../jrst/en/index.html"/> + <item name="JRst :: Maven Plugin" href="../maven-jrst-plugin/en/index.html"/> + <item name="JRst :: Doxia module" href="../doxia-module-jrst/en/index.html"/> + <item name="JRst :: Documentation" href="../jrst-doc/en/index.html"/> + </menu> + + <menu ref="reports"/> + </body> </project> Copied: trunk/src/site/site_fr.xml (from rev 458, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2010-04-15 17:53:31 UTC (rev 459) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + </poweredBy> + + <body> + + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> +  + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu name="Langue"> + <item name="French" href="index.html"/> + <item name="English" href="./en/index.html"/> + </menu> + + <menu ref="modules"/> + + <menu ref="reports"/> + </body> +</project> Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author

1 0

r458 - trunk/jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 15 Apr '10

15 Apr '10

Author: sletellier Date: 2010-04-15 12:57:39 +0200 (Thu, 15 Apr 2010) New Revision: 458 Log: #520 : Gestion du commentaire en en-t?\195?\170te avant le titre principale Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-04-15 10:41:21 UTC (rev 457) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-04-15 10:57:39 UTC (rev 458) @@ -2133,7 +2133,6 @@ if (lines != null) { // int levelRef = level(line); for (String line : lines) { - System.out.println(line); Element comment = DocumentHelper.createElement("comment"); comment.addAttribute("level", "0"); comment.addAttribute("xml:space", "preserve"); @@ -2152,6 +2151,7 @@ // result.addText(text); // } } + in.mark(); } endPeek(); Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-04-15 10:41:21 UTC (rev 457) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-04-15 10:57:39 UTC (rev 458) @@ -806,13 +806,14 @@ // skipBlankLine(lexer); item = lexer.peekDocInfo(); - // Ajout des commentaires - // System.out.println(comment.asXML()); - for (Element comment : comments){ - item.add(composeComment(comment)); - } } + // Ajout des commentaires + // System.out.println(comment.asXML()); + for (Element comment : comments){ + result.add(composeComment(comment)); + } + // l'abstract du doc item = lexer.peekTitle(); while (itemNotEquals(TITLE, item) && !lexer.eof()) {

1 0

r457 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 15 Apr '10

15 Apr '10

Author: sletellier Date: 2010-04-15 12:41:21 +0200 (Thu, 15 Apr 2010) New Revision: 457 Log: #520 : Gestion du commentaire en en-t?\195?\170te avant le titre principale Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-04-12 12:14:38 UTC (rev 456) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-04-15 10:41:21 UTC (rev 457) @@ -2102,7 +2102,7 @@ result.addAttribute("xml:space", "preserve"); // first line is part of comment - result.setText(line.substring(2).trim() + "\n"); + result.setText(line.substring(2).trim()); line = in.readLine(); int level = level(line); if (level > 0) { @@ -2121,6 +2121,44 @@ } /** + * .. comment + * + * @return Element + * @throws IOException + */ + public List<Element> peekAllComment() throws IOException { + beginPeek(); + List<Element> result = new ArrayList<Element>(); + String[] lines = in.readWhile("^\\.\\.\\s*.*$"); + if (lines != null) { +// int levelRef = level(line); + for (String line : lines) { + System.out.println(line); + Element comment = DocumentHelper.createElement("comment"); + comment.addAttribute("level", "0"); + comment.addAttribute("xml:space", "preserve"); + + // first line is part of comment + comment.setText(line.substring(2).trim()); + result.add(comment); + +// int level = level(line); +// if (level == levelRef) { +// String[] lines = readBlock(level); +// String text = line.substring(level); +// for (String l : lines) { +// text += "\n" + l.substring(level); +// } +// result.addText(text); +// } + } + } + + endPeek(); + return result; + } + + /** * .. _frungible doodads: http://www.example.org/ * * @return Element Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-04-12 12:14:38 UTC (rev 456) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-04-15 10:41:21 UTC (rev 457) @@ -564,7 +564,7 @@ } /** - * @param LinkedList + * @param title * <Element> title, String num * @return Element */ @@ -694,6 +694,12 @@ lexer.remove(); } + // skip blank line + skipBlankLine(lexer); + + // les commentaires + List<Element> comments = lexer.peekAllComment(); + // le titre du doc item = lexer.peekTitle(); if (itemEquals(TITLE, item)) { @@ -800,6 +806,11 @@ // skipBlankLine(lexer); item = lexer.peekDocInfo(); + // Ajout des commentaires + // System.out.println(comment.asXML()); + for (Element comment : comments){ + item.add(composeComment(comment)); + } } // l'abstract du doc @@ -852,7 +863,6 @@ * </p> * * @param lexer - * @param root * @return Element * @throws DocumentException * @throws IOException Modified: trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2010-04-12 12:14:38 UTC (rev 456) +++ trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2010-04-15 10:41:21 UTC (rev 457) @@ -35,6 +35,9 @@ import javax.swing.JSplitPane; import javax.swing.JTextArea; import javax.swing.plaf.FileChooserUI; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.XMLUnit; import org.dom4j.Document; @@ -50,6 +53,9 @@ */ @Ignore public class Compare { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(Compare.class); static boolean[] bColorRst; @@ -73,7 +79,13 @@ JRSTReader jrst = new JRSTReader(); Document docRst = jrst.read(in); // JRST String cmd = "rst2xml " + source.getPath(); - Process p = Runtime.getRuntime().exec(cmd); // Python + Process p = null; + try { + p = Runtime.getRuntime().exec(cmd); // Python + } catch (IOException eee) { + log.error("You must install python-docutils to compare rst files"); + System.exit(0); + } ThreadRedirection t = new ThreadRedirection(p); t.start(); p.waitFor(); // On attend que le processus ce termine

1 0

r456 - trunk
by tchemit＠users.nuiton.org 12 Apr '10

12 Apr '10

Author: tchemit Date: 2010-04-12 14:14:38 +0200 (Mon, 12 Apr 2010) New Revision: 456 Log: Utilisation de mavenpom4redmine 2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-09 23:06:52 UTC (rev 455) +++ trunk/pom.xml 2010-04-12 12:14:38 UTC (rev 456) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.7</version> + <version>2.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r455 - in trunk: . doxia-module-jrst doxia-module-jrst/src/main/java/org/nuiton/jrst doxia-module-jrst/src/site doxia-module-jrst/src/site/apt doxia-module-jrst/src/site/en/apt doxia-module-jrst/src/test/java/org/nuiton/jrst doxia-module-jrst/src/test/resources jrst jrst/doc jrst/doc/en jrst/doc/fr jrst/src/main/assembly jrst/src/main/java/org/nuiton/jrst jrst/src/main/java/org/nuiton/jrst/convertisor jrst/src/main/java/org/nuiton/jrst/directive jrst/src/main/resources jrst/src/main/resources
by tchemit＠users.nuiton.org 09 Apr '10

09 Apr '10

Author: tchemit Date: 2010-04-10 01:06:52 +0200 (Sat, 10 Apr 2010) New Revision: 455 Log: add svn:keywords on files Modified: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/doxia-module-jrst/LICENSE.txt trunk/doxia-module-jrst/README.txt trunk/doxia-module-jrst/changelog.txt trunk/doxia-module-jrst/pom.xml trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java trunk/doxia-module-jrst/src/site/apt/devel.apt trunk/doxia-module-jrst/src/site/apt/index.apt trunk/doxia-module-jrst/src/site/en/apt/devel.apt trunk/doxia-module-jrst/src/site/en/apt/index.apt trunk/doxia-module-jrst/src/site/site_en.xml trunk/doxia-module-jrst/src/site/site_fr.xml trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java trunk/doxia-module-jrst/src/test/resources/test.rst trunk/jrst-doc/LICENSE.txt trunk/jrst-doc/README.txt trunk/jrst-doc/changelog.txt trunk/jrst-doc/pom.xml trunk/jrst-doc/src/site/en/rst/devel/Todo.rst trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png trunk/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png trunk/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png trunk/jrst-doc/src/site/en/rst/devel/library.rst trunk/jrst-doc/src/site/en/rst/index.rst trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst trunk/jrst-doc/src/site/en/rst/user/functionality.rst trunk/jrst-doc/src/site/en/rst/user/images/biohazard.png trunk/jrst-doc/src/site/en/rst/user/index.rst trunk/jrst-doc/src/site/resources/en-redirect.html trunk/jrst-doc/src/site/resources/fr-redirect.html trunk/jrst-doc/src/site/resources/schemas/diagrammeClass.png trunk/jrst-doc/src/site/resources/schemas/diagrammeGeneration.png trunk/jrst-doc/src/site/resources/schemas/diagrammeSequence.png trunk/jrst-doc/src/site/resources/schemas/presentationXSL.png trunk/jrst-doc/src/site/rst/devel/Todo.rst trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst trunk/jrst-doc/src/site/rst/devel/docExterne.rst trunk/jrst-doc/src/site/rst/devel/librairies.rst trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst trunk/jrst-doc/src/site/rst/index.rst trunk/jrst-doc/src/site/rst/user/faq.rst trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst trunk/jrst-doc/src/site/rst/user/images/biohazard.png trunk/jrst-doc/src/site/rst/user/index.rst trunk/jrst-doc/src/site/rst/user/presentationRST.rst trunk/jrst-doc/src/site/site_en.xml trunk/jrst-doc/src/site/site_fr.xml trunk/jrst/LICENSE.txt trunk/jrst/README.txt trunk/jrst/changelog.txt trunk/jrst/doc/Generation.rst trunk/jrst/doc/Parser.rst trunk/jrst/doc/en/index.rst trunk/jrst/doc/fr/DiagrammeClass.png trunk/jrst/doc/fr/DiagrammeSequance.png trunk/jrst/doc/fr/Todo.rst trunk/jrst/doc/fr/biohazard.png trunk/jrst/doc/fr/docDeveloppeur.rst trunk/jrst/doc/fr/docExterne.rst trunk/jrst/doc/fr/fonctionnalites.rst trunk/jrst/doc/fr/librairies.rst trunk/jrst/doc/fr/presentationRST.rst trunk/jrst/doc/fr/presentationXSL.png trunk/jrst/doc/fr/presentationXSL.rst trunk/jrst/doc/index.rst trunk/jrst/doc/new_implementation.rst trunk/jrst/pom.xml trunk/jrst/src/main/assembly/deps.xml trunk/jrst/src/main/assembly/full.xml trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/ContentDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties trunk/jrst/src/main/resources/icone/cancel.png trunk/jrst/src/main/resources/icone/more.gif trunk/jrst/src/main/resources/icone/open.png trunk/jrst/src/main/resources/log4j.properties trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd trunk/jrst/src/main/resources/xsl/dn2dbk.xsl trunk/jrst/src/main/resources/xsl/rngrest.xsl trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl trunk/jrst/src/main/resources/xsl/xml2rst.xsl trunk/jrst/src/site/apt/index.apt trunk/jrst/src/site/en/apt/index.apt trunk/jrst/src/site/site_en.xml trunk/jrst/src/site/site_fr.xml trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java trunk/jrst/src/test/resources/comparePython.xml trunk/jrst/src/test/resources/definition.rst trunk/jrst/src/test/resources/footnoteTest.rst trunk/jrst/src/test/resources/footnoteTest2.rst trunk/jrst/src/test/resources/frEntier.rst trunk/jrst/src/test/resources/test.rst trunk/jrst/src/test/resources/test2.rst trunk/jrst/src/test/resources/test3.rst trunk/jrst/src/test/resources/test4.rst trunk/jrst/src/test/resources/text.rst trunk/jrst/src/test/resources/textEntier.rst trunk/jrst/src/test/resources/textHeader.rst trunk/jrst/src/test/resources/textLiteral.txt trunk/maven-jrst-plugin/LICENSE.txt trunk/maven-jrst-plugin/README.txt trunk/maven-jrst-plugin/changelog.txt trunk/maven-jrst-plugin/doc/index.rst trunk/maven-jrst-plugin/pom.xml trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java trunk/maven-jrst-plugin/src/main/resources/log4j.properties trunk/maven-jrst-plugin/src/site/apt/index.apt trunk/maven-jrst-plugin/src/site/en/apt/index.apt trunk/maven-jrst-plugin/src/site/site_en.xml trunk/maven-jrst-plugin/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site.xml trunk/src/site/site_en.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/changelog.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/README.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/changelog.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/pom.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java =================================================================== --- trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-04-03 10:30:49 UTC (rev 454) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-04-09 23:06:52 UTC (rev 455) @@ -32,7 +32,7 @@ * specified doxia Sink. * * @author <a href="mailto:jason@maven.org">Jason van Zyl</a> - * @version $Id: JrstParser.java 746992 2009-02-23 12:35:59Z vsiveton $ + * @version $Id$ * @since 0.9.0 * @plexus.component role="org.apache.maven.doxia.parser.Parser" * role-hint="jrst" Property changes on: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/site/apt/devel.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/site/en/apt/devel.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/doxia-module-jrst/src/test/resources/test.rst ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/README.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/Generation.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/Parser.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/en/index.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/DiagrammeClass.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/DiagrammeSequance.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/Todo.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/biohazard.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/docDeveloppeur.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/docExterne.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/fonctionnalites.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/librairies.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/presentationRST.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/presentationXSL.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/fr/presentationXSL.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/index.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/doc/new_implementation.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/assembly/deps.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/assembly/full.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ContentDirective.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/icone/cancel.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/icone/more.gif ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/icone/open.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/xsl/dn2dbk.xsl ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/xsl/rngrest.xsl ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/main/resources/xsl/xml2rst.xsl ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/comparePython.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/definition.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/footnoteTest.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/footnoteTest2.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/frEntier.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/test.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/test2.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/test3.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/test4.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/text.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/textEntier.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/textHeader.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst/src/test/resources/textLiteral.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/README.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/Todo.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/devel/library.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/user/functionality.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/user/images/biohazard.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/en/rst/user/index.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/resources/en-redirect.html ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/resources/fr-redirect.html ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/resources/schemas/diagrammeClass.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/resources/schemas/diagrammeGeneration.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/resources/schemas/diagrammeSequence.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/resources/schemas/presentationXSL.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/devel/Todo.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/devel/docExterne.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/devel/librairies.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/user/faq.rst ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/user/images/biohazard.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/user/index.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/rst/user/presentationRST.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/jrst-doc/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/README.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/changelog.txt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/doc/index.rst ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/maven-jrst-plugin/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + HeadURL Id Date Revision Author Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/site/site.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author

1 0

r454 - trunk
by tchemit＠users.nuiton.org 03 Apr '10

03 Apr '10

Author: tchemit Date: 2010-04-03 12:30:49 +0200 (Sat, 03 Apr 2010) New Revision: 454 Log: Evolution #371: Use nuiton-utils 1.2.1 and nuiton-i18n 1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-27 20:04:01 UTC (rev 453) +++ trunk/pom.xml 2010-04-03 10:30:49 UTC (rev 454) @@ -284,7 +284,7 @@ <doxia.version>1.1.2</doxia.version> <nuiton-utils.version>1.2</nuiton-utils.version> - <i18n.version>1.1</i18n.version> + <i18n.version>1.2.1</i18n.version> </properties> <build>

1 0

r453 - trunk
by tchemit＠users.nuiton.org 27 Mar '10

27 Mar '10

Author: tchemit Date: 2010-03-27 21:04:01 +0100 (Sat, 27 Mar 2010) New Revision: 453 Log: Utilisation de mavenpom4redmine 2.0.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-12 20:14:04 UTC (rev 452) +++ trunk/pom.xml 2010-03-27 20:04:01 UTC (rev 453) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> + <version>2.0.7</version> </parent> <artifactId>jrst</artifactId>

1 0

r452 - trunk
by tchemit＠users.nuiton.org 12 Mar '10

12 Mar '10

Author: tchemit Date: 2010-03-12 21:14:04 +0100 (Fri, 12 Mar 2010) New Revision: 452 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-10 13:17:22 UTC (rev 451) +++ trunk/pom.xml 2010-03-12 20:14:04 UTC (rev 452) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>jrst</artifactId>

1 0

r451 - in trunk: . maven-jrst-plugin
by tchemit＠users.nuiton.org 10 Mar '10

10 Mar '10

Author: tchemit Date: 2010-03-10 14:17:22 +0100 (Wed, 10 Mar 2010) New Revision: 451 Log: - fix plugin javadoc taglets - Evolution #371: Use nuiton-utils 1.2 and nuiton-i18n 1.1 Modified: trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-02-22 17:04:19 UTC (rev 450) +++ trunk/maven-jrst-plugin/pom.xml 2010-03-10 13:17:22 UTC (rev 451) @@ -75,195 +75,6 @@ </executions> </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <docencoding>${project.reporting.outputEncoding}</docencoding> - <encoding>${project.reporting.outputEncoding}</encoding> - <charset>${project.reporting.outputEncoding}</charset> - <quiet>true</quiet> - <skip>${maven.javadoc.skip}</skip> - <taglets> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> - </plugins> </build> @@ -271,204 +82,13 @@  <reporting> <plugins> +  <plugin> <artifactId>maven-plugin-plugin</artifactId> <version>2.5.1</version> </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <quiet>true</quiet> - <skip>${maven.javadoc.skip}</skip> - <docencoding>${project.build.sourceEncoding}</docencoding> - <encoding>${project.build.sourceEncoding}</encoding> - <charset>${project.reporting.outputEncoding}</charset> - <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> - <taglets> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass> - org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet - </tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>javadoc</report> - <report>test-javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> </plugins> </reporting> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-02-22 17:04:19 UTC (rev 450) +++ trunk/pom.xml 2010-03-10 13:17:22 UTC (rev 451) @@ -283,8 +283,8 @@  <doxia.version>1.1.2</doxia.version> - <nuiton-utils.version>1.1.1</nuiton-utils.version> - <i18n.version>1.0.1</i18n.version> + <nuiton-utils.version>1.2</nuiton-utils.version> + <i18n.version>1.1</i18n.version> </properties> <build>

1 0

r450 - in trunk: doxia-module-jrst maven-jrst-plugin
by echatellier＠users.nuiton.org 26 Feb '10

26 Feb '10

Author: echatellier Date: 2010-02-22 18:04:19 +0100 (Mon, 22 Feb 2010) New Revision: 450 Modified: trunk/doxia-module-jrst/pom.xml trunk/maven-jrst-plugin/pom.xml Log: Add missing version Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-02-22 11:40:05 UTC (rev 449) +++ trunk/doxia-module-jrst/pom.xml 2010-02-22 17:04:19 UTC (rev 450) @@ -101,6 +101,7 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> <executions> <execution> <goals> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-02-22 11:40:05 UTC (rev 449) +++ trunk/maven-jrst-plugin/pom.xml 2010-02-22 17:04:19 UTC (rev 450) @@ -65,6 +65,7 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> <executions> <execution> <goals> @@ -273,6 +274,7 @@  <plugin> <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> </plugin> <plugin>

2 1