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> + <!--pluginManagement> <plugins> <plugin> <artifactId>maven-site-plugin</artifactId> @@ -46,10 +64,15 @@ <version>${project.version}</version> </dependency> </dependencies> + <executions> + <execution> + <id>default-site</id> + </execution> + </executions> </plugin> </plugins> - </pluginManagement> + </pluginManagement--> </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> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> - <!-- plugin plugin --> - <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> - <!--Site--> - <reporting> + </profile> + + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> - <!--Site report's plugin--> - <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> <!-- Site fr et en--> - <!-- TODO faire fonctionner le multi-language en multi-module...--> - <!--siteLocales>fr,en</siteLocales--> + <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> + <!--<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/"/> + <!--item name="[fr" href="${project.url}/index.html"/> + <item name="en]" href="${project.url}/en/index.html"/--> + </links> - <menu ref="reports"/> - </body> + <menu name="Language"> + <item name="French" href="../index.html"/> + <item name="English" href="index.html"/> + </menu> + + <!--<menu ref="modules"/>--> + + <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/"/> + <!--item name="[fr" href="${project.url}/index.html"/> + <item name="en]" href="${project.url}/en/index.html"/--> + </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
participants (1)
-
tchemit@users.nuiton.org