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

r409 - in trunk: . src/site
by tchemit＠users.nuiton.org 25 Aug '09

25 Aug '09

Author: tchemit Date: 2009-08-26 00:39:59 +0200 (Wed, 26 Aug 2009) New Revision: 409 Modified: trunk/pom.xml trunk/src/site/site.xml trunk/src/site/site_en.xml Log: - bump mavenpom and i18n versions - clean site.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-23 14:41:18 UTC (rev 408) +++ trunk/pom.xml 2009-08-25 22:39:59 UTC (rev 409) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <artifactId>jrst</artifactId> @@ -232,7 +232,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </plugin> </plugins> Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-23 14:41:18 UTC (rev 408) +++ trunk/src/site/site.xml 2009-08-25 22:39:59 UTC (rev 409) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>/</href> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-08-23 14:41:18 UTC (rev 408) +++ trunk/src/site/site_en.xml 2009-08-25 22:39:59 UTC (rev 409) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>/</href>

1 0

r408 - tags/jrst-1.0.0/jrst-doc
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:41:18 +0200 (Sun, 23 Aug 2009) New Revision: 408 Added: tags/jrst-1.0.0/jrst-doc/LICENSE.txt Log: missing LICENCE.txt Copied: tags/jrst-1.0.0/jrst-doc/LICENSE.txt (from rev 407, tags/jrst-1.0.0/LICENSE.txt) =================================================================== --- tags/jrst-1.0.0/jrst-doc/LICENSE.txt (rev 0) +++ tags/jrst-1.0.0/jrst-doc/LICENSE.txt 2009-08-23 14:41:18 UTC (rev 408) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: tags/jrst-1.0.0/jrst-doc/LICENSE.txt ___________________________________________________________________ Added: svn:mergeinfo +

1 0

r407 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:32:39 +0200 (Sun, 23 Aug 2009) New Revision: 407 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2009-08-23 14:32:36 UTC (rev 406) +++ trunk/doxia-module-jrst/pom.xml 2009-08-23 14:32:39 UTC (rev 407) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2009-08-23 14:32:36 UTC (rev 406) +++ trunk/jrst/pom.xml 2009-08-23 14:32:39 UTC (rev 407) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2009-08-23 14:32:36 UTC (rev 406) +++ trunk/jrst-doc/pom.xml 2009-08-23 14:32:39 UTC (rev 407) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2009-08-23 14:32:36 UTC (rev 406) +++ trunk/maven-jrst-plugin/pom.xml 2009-08-23 14:32:39 UTC (rev 407) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-23 14:32:36 UTC (rev 406) +++ trunk/pom.xml 2009-08-23 14:32:39 UTC (rev 407) @@ -13,7 +13,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <modules> <module>jrst</module> @@ -246,9 +246,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.0.0</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.0.0</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.0.0</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> </project>

1 0

r406 - tags
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:32:36 +0200 (Sun, 23 Aug 2009) New Revision: 406 Added: tags/jrst-1.0.0/ Log: [maven-scm] copy for tag jrst-1.0.0

1 0

r405 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:32:32 +0200 (Sun, 23 Aug 2009) New Revision: 405 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release jrst-1.0.0 Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2009-08-23 14:30:50 UTC (rev 404) +++ trunk/doxia-module-jrst/pom.xml 2009-08-23 14:32:32 UTC (rev 405) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0-rc-4-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2009-08-23 14:30:50 UTC (rev 404) +++ trunk/jrst/pom.xml 2009-08-23 14:32:32 UTC (rev 405) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0-rc-4-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2009-08-23 14:30:50 UTC (rev 404) +++ trunk/jrst-doc/pom.xml 2009-08-23 14:32:32 UTC (rev 405) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0-rc-4-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2009-08-23 14:30:50 UTC (rev 404) +++ trunk/maven-jrst-plugin/pom.xml 2009-08-23 14:32:32 UTC (rev 405) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.0-rc-4-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-23 14:30:50 UTC (rev 404) +++ trunk/pom.xml 2009-08-23 14:32:32 UTC (rev 405) @@ -13,7 +13,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.0.0-rc-4-SNAPSHOT</version> + <version>1.0.0</version> <modules> <module>jrst</module> @@ -246,9 +246,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.0.0</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.0.0</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.0.0</url> </scm> </project>

1 0

r404 - in trunk: . src/site
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:30:50 +0200 (Sun, 23 Aug 2009) New Revision: 404 Modified: trunk/changelog.txt trunk/pom.xml trunk/src/site/site.xml trunk/src/site/site_en.xml Log: - use jrst-doc - clean sites Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-08-23 14:28:27 UTC (rev 403) +++ trunk/changelog.txt 2009-08-23 14:30:50 UTC (rev 404) @@ -1,4 +1,6 @@ -ver-1.0.0 ? - * migrate to nuiton +1.0.0 chemit 20090823 + + * add a jrst-doc module + * migrate to nuiton (relocate artifacts, change package names) * use a multi-module layout Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-23 14:28:27 UTC (rev 403) +++ trunk/pom.xml 2009-08-23 14:30:50 UTC (rev 404) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>jrst</artifactId> @@ -19,6 +19,7 @@ <module>jrst</module> <module>maven-jrst-plugin</module> <module>doxia-module-jrst</module> + <module>jrst-doc</module> </modules> <dependencyManagement> @@ -34,11 +35,17 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.0-rc-2</version> + <version>1.1.0</version> <scope>compile</scope> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> + </dependency> + + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <version>1.2</version> @@ -219,13 +226,13 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.5</version> + <version>1.3.8</version> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.0</version> </plugin> </plugins> Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-23 14:28:27 UTC (rev 403) +++ trunk/src/site/site.xml 2009-08-23 14:30:50 UTC (rev 404) @@ -3,26 +3,13 @@ <publishDate format="dd/MM/yyyy"/> - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <href>/</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <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> <body> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-08-23 14:28:27 UTC (rev 403) +++ trunk/src/site/site_en.xml 2009-08-23 14:30:50 UTC (rev 404) @@ -3,26 +3,13 @@ <publishDate format="dd/MM/yyyy"/> - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <href>/</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <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> <body>

1 0

r403 - in trunk/jrst/src: main/resources site site/apt site/en site/en/apt
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:28:27 +0200 (Sun, 23 Aug 2009) New Revision: 403 Added: trunk/jrst/src/site/apt/ trunk/jrst/src/site/apt/index.apt trunk/jrst/src/site/en/apt/ trunk/jrst/src/site/en/apt/index.apt Modified: trunk/jrst/src/main/resources/log4j.properties trunk/jrst/src/site/site.xml trunk/jrst/src/site/site_en.xml Log: no use of jrst for doc (still not available before doxia-jrst-module) Modified: trunk/jrst/src/main/resources/log4j.properties =================================================================== --- trunk/jrst/src/main/resources/log4j.properties 2009-08-23 14:28:24 UTC (rev 402) +++ trunk/jrst/src/main/resources/log4j.properties 2009-08-23 14:28:27 UTC (rev 403) @@ -1,5 +1,5 @@ # Global logging configuration -log4j.rootLogger=DEBUG, stdout +log4j.rootLogger=WARN, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender @@ -7,4 +7,4 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level -log4j.logger.org.nuiton.jrst=DEBUG +log4j.logger.org.nuiton.jrst=WARN Added: trunk/jrst/src/site/apt/index.apt =================================================================== --- trunk/jrst/src/site/apt/index.apt (rev 0) +++ trunk/jrst/src/site/apt/index.apt 2009-08-23 14:28:27 UTC (rev 403) @@ -0,0 +1,11 @@ +---- +Jrst -lib +---- +---- +2009-08-23 +---- + +Parseur reStructuredText_ : le JRst + + La documentation de la librairie se trouve dans le projet + {{{http://maven-site.nuiton.org/jrst/jrst-doc/index.html}jrst-doc}}. Added: trunk/jrst/src/site/en/apt/index.apt =================================================================== --- trunk/jrst/src/site/en/apt/index.apt (rev 0) +++ trunk/jrst/src/site/en/apt/index.apt 2009-08-23 14:28:27 UTC (rev 403) @@ -0,0 +1,11 @@ +---- +Jrst -lib +---- +---- +2009-08-23 +---- + +Parseur reStructuredText_ : JRst + + The librairy documentation is in the project + {{{http://maven-site.nuiton.org/jrst/jrst-doc/index.html}jrst-doc}}. Modified: trunk/jrst/src/site/site.xml =================================================================== --- trunk/jrst/src/site/site.xml 2009-08-23 14:28:24 UTC (rev 402) +++ trunk/jrst/src/site/site.xml 2009-08-23 14:28:27 UTC (rev 403) @@ -1,24 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="JRst"> +<project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>Java ReStructuredText parser</name> <href>/</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <body> <breadcrumbs> @@ -27,27 +14,12 @@ <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> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <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/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.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/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu> Modified: trunk/jrst/src/site/site_en.xml =================================================================== --- trunk/jrst/src/site/site_en.xml 2009-08-23 14:28:24 UTC (rev 402) +++ trunk/jrst/src/site/site_en.xml 2009-08-23 14:28:27 UTC (rev 403) @@ -1,22 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="JRst"> +<project name="${project.name}"> - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>Java ReStructuredText parser</name> <href>/</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <body> <breadcrumbs> @@ -25,28 +14,12 @@ <menu ref="parent"/> - <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> - <menu name="Download"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <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/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.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/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu>

1 0

r402 - in trunk/jrst/src/site: . en
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:28:24 +0200 (Sun, 23 Aug 2009) New Revision: 402 Removed: trunk/jrst/src/site/en/rst/ trunk/jrst/src/site/resources/ trunk/jrst/src/site/rst/ Log: no use of jrst for doc (still not available before doxia-jrst-module)

1 0

r401 - in trunk/maven-jrst-plugin: . src/site src/site/apt src/site/en src/site/en/apt
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:24:15 +0200 (Sun, 23 Aug 2009) New Revision: 401 Added: trunk/maven-jrst-plugin/src/site/apt/ trunk/maven-jrst-plugin/src/site/apt/index.apt trunk/maven-jrst-plugin/src/site/en/apt/ trunk/maven-jrst-plugin/src/site/en/apt/index.apt Modified: trunk/maven-jrst-plugin/ trunk/maven-jrst-plugin/src/site/site.xml trunk/maven-jrst-plugin/src/site/site_en.xml Log: no use of jrst for doc (still not available before doxia-jrst-module) Property changes on: trunk/maven-jrst-plugin ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings *.ipr *.iws + *.ipr *.iws .classpath .project target nbactions.xml .settings Copied: trunk/maven-jrst-plugin/src/site/apt/index.apt (from rev 396, trunk/maven-jrst-plugin/src/site/rst/index.rst) =================================================================== --- trunk/maven-jrst-plugin/src/site/apt/index.apt (rev 0) +++ trunk/maven-jrst-plugin/src/site/apt/index.apt 2009-08-23 14:24:15 UTC (rev 401) @@ -0,0 +1,103 @@ +---- +Maven-jrst-plugin +---- +---- +2009-08-23 +---- + +Présentation + + Le plugin maven2 pour utiliser la librairie jrst. + +Fonctionnement + + Maven ne gère pas le RST par défaut, voilà pourquoi le plugin + maven-jrst-plugin a été développé. + + Il utilise donc une structure similaire des sources des sites + maven, mais les transforme en xdoc, et passe ensuite le relai + à maven. + + Le pom, doit doit être configuré pour : + + * demander la génération des fichiers xdoc + + * changer le répertoire par défaut des sources du site + +Configuration du pom + +* pre-site : maven-jrst-plugin + +----------------------------------------------------------------------------------- + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${maven-jrst-plugin.version}</version> + <configuration> + <directoryIn>${basedir}/src/site</directoryIn> + <directoryOut>${project.build.directory}/generated-site</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>UTF-8</inputEncoding> + <outputEncoding>UTF-8</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> +----------------------------------------------------------------------------------- + +* pre-site : maven-antrun-plugin + + Ce plugin est utilisé pour copier les fichiers "non-rst" + dans le répertoire de génération de site. + +----------------------------------------------------------------------------------- + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${basedir}/src/site"/> + <copy todir="${project.build.directory}/generated-site" + verbose="${maven.verbose}" + overwrite="false"> + <fileset dir="${basedir}/src/site"> + <exclude name="**/rst/**"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + +----------------------------------------------------------------------------------- + +* site : maven-site-plugin + +----------------------------------------------------------------------------------- + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <siteDirectory>${project.build.directory}/generated-site</siteDirectory> + <inputEncoding>UTF-8</inputEncoding> + <outputEncoding>UTF-8</outputEncoding> + <generateReports>true</generateReports> + <locales>fr,en</locales> + </configuration> + </plugin> + +----------------------------------------------------------------------------------- Copied: trunk/maven-jrst-plugin/src/site/en/apt/index.apt (from rev 396, trunk/maven-jrst-plugin/src/site/en/rst/index.rst) =================================================================== --- trunk/maven-jrst-plugin/src/site/en/apt/index.apt (rev 0) +++ trunk/maven-jrst-plugin/src/site/en/apt/index.apt 2009-08-23 14:24:15 UTC (rev 401) @@ -0,0 +1,98 @@ +---- +Maven-jrst-plugin +---- +---- +2009-08-23 +---- + +Presentation + + Maven plugin to use JRST library. + +Operation + + Maven can't manage RST documentation file format. So, that's + why maven-jrst-plugin has been made. + + It use the same directory structure for site sources, transform + it into xdoc, and maven-site-plugin is used to build finale site. + + But, pom has to be configured: + + * to pre generate xdoc file from rst + + * change maven default site directory + +POM configuration + +* pre-site : maven-jrst-plugin + +-------------------------------------------------------------------------------------- + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${basedir}/src/site</directoryIn> + <directoryOut>${project.build.directory}/generated-site</directoryOut> + <defaultLocale>en</defaultLocale> + <inputEncoding>UTF-8</inputEncoding> + <outputEncoding>UTF-8</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> +-------------------------------------------------------------------------------------- + +* pre-site : maven-antrun-plugin + +This plugin is used to copy non rst files (such as images...) +into the generation site directory. + +-------------------------------------------------------------------------------------- + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${basedir}/src/site"/> + <copy todir="${project.build.directory}/generated-site" verbose="${maven.verbose}" overwrite="false"> + <fileset dir="${basedir}/src/site"> + <exclude name="**/rst/**"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> +-------------------------------------------------------------------------------------- + +* site : maven-site-plugin + +-------------------------------------------------------------------------------------- + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0-beta-7</version> + <configuration> + <siteDirectory>${project.build.directory}/generated-site</siteDirectory> + <inputEncoding>UTF-8</inputEncoding> + <outputEncoding>UTF-8</outputEncoding> + <generateReports>true</generateReports> + <locales>en,fr</locales> + </configuration> + </plugin> +-------------------------------------------------------------------------------------- Property changes on: trunk/maven-jrst-plugin/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/maven-jrst-plugin/src/site/site.xml =================================================================== --- trunk/maven-jrst-plugin/src/site/site.xml 2009-08-23 14:23:56 UTC (rev 400) +++ trunk/maven-jrst-plugin/src/site/site.xml 2009-08-23 14:24:15 UTC (rev 401) @@ -1,24 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <href>/</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> @@ -36,11 +23,11 @@ </menu> <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <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/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.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/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu> Modified: trunk/maven-jrst-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-jrst-plugin/src/site/site_en.xml 2009-08-23 14:23:56 UTC (rev 400) +++ trunk/maven-jrst-plugin/src/site/site_en.xml 2009-08-23 14:24:15 UTC (rev 401) @@ -1,22 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> - <href>/</href> + <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> @@ -34,11 +23,11 @@ </menu> <menu name="Download"> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + <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/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.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/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> </menu>

1 0

r400 - in trunk/maven-jrst-plugin/src/site: . en
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 16:23:56 +0200 (Sun, 23 Aug 2009) New Revision: 400 Removed: trunk/maven-jrst-plugin/src/site/en/rst/ trunk/maven-jrst-plugin/src/site/rst/ Log: no use of jrst for doc (still not available before doxia-jrst-module)

1 0