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

r417 - trunk/jrst-doc
by tchemit＠users.nuiton.org Sept. 29, 2009

Sept. 29, 2009

Author: tchemit Date: 2009-09-29 18:49:10 +0200 (Tue, 29 Sep 2009) New Revision: 417 Added: trunk/jrst-doc/LICENSE.txt Log: add license file Added: trunk/jrst-doc/LICENSE.txt =================================================================== --- trunk/jrst-doc/LICENSE.txt (rev 0) +++ trunk/jrst-doc/LICENSE.txt 2009-09-29 16:49:10 UTC (rev 417) @@ -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. +

1 0

r416 - in trunk: . jrst jrst/src/test/java/org/nuiton/jrst
by tchemit＠users.nuiton.org Sept. 29, 2009

Sept. 29, 2009

Author: tchemit Date: 2009-09-29 18:44:36 +0200 (Tue, 29 Sep 2009) New Revision: 416 Modified: trunk/jrst/pom.xml trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java trunk/pom.xml Log: - use mavenpom 1.0.3, junit 4.7, maven-helper-plugin 1.1.0 - no more junit 3 tests - fix xalan dependency pb without adding a dep to the labs :) Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2009-09-17 09:41:56 UTC (rev 415) +++ trunk/jrst/pom.xml 2009-09-29 16:44:36 UTC (rev 416) @@ -39,11 +39,7 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>fop</artifactId> </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xml-serializer</artifactId> - <scope>compile</scope> - </dependency> +  <dependency> <groupId>uk.co.flamingpenguin.jewelcli</groupId> @@ -54,6 +50,11 @@ <groupId>xalan</groupId> <artifactId>xalan</artifactId> </dependency> +  + <dependency> + <groupId>xalan</groupId> + <artifactId>serializer</artifactId> + </dependency>  <dependency> <groupId>org.nuiton.thirdparty</groupId> Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2009-09-17 09:41:56 UTC (rev 415) +++ trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2009-09-29 16:44:36 UTC (rev 416) @@ -86,6 +86,7 @@ * {@link org.nuiton.jrst.AdvancedReader#skipBlankLines()}. * @throws IOException */ + @Test public void testSkipBlankLines() throws IOException { { AdvancedReader in = new AdvancedReader(new FileReader(file)); @@ -106,6 +107,7 @@ * Test method for {@link org.nuiton.jrst.AdvancedReader#readAll()}. * @throws IOException */ + @Test public void testReadAll() throws IOException { { AdvancedReader in = new AdvancedReader(new FileReader(file)); @@ -130,6 +132,7 @@ * Test method for {@link org.nuiton.jrst.AdvancedReader#readLines(int)}. * @throws IOException */ + @Test public void testReadLines() throws IOException { { AdvancedReader in = new AdvancedReader(new FileReader(file)); @@ -155,6 +158,7 @@ * {@link org.nuiton.jrst.AdvancedReader#readUntil(java.lang.String)}. * @throws IOException */ + @Test public void testReadUntil() throws IOException { { AdvancedReader in = new AdvancedReader(new FileReader(file)); @@ -186,6 +190,7 @@ * {@link org.nuiton.jrst.AdvancedReader#readUntil(java.lang.String)}. * @throws IOException */ + @Test public void testReadWhile() throws IOException { { AdvancedReader in = new AdvancedReader(new FileReader(file)); @@ -218,6 +223,7 @@ * Test method for {@link org.nuiton.jrst.AdvancedReader#readLine()}. * @throws IOException */ + @Test public void testReadLine() throws IOException { { AdvancedReader in = new AdvancedReader(new FileReader(file)); @@ -240,6 +246,7 @@ } } + @Test public void testMark() throws IOException { AdvancedReader in = new AdvancedReader(new StringReader(text)); String line = in.readLine(); @@ -251,6 +258,7 @@ Assert.assertEquals("1 toto tata tutu", line); } + @Test public void testUnread() throws IOException { AdvancedReader in = new AdvancedReader(new StringReader(text)); Assert.assertEquals(0, in.getCharNumber()); @@ -271,6 +279,7 @@ Assert.assertEquals("1 toto tata tutu", line); } + @Test public void testSkip() throws IOException { AdvancedReader in = new AdvancedReader(new StringReader(text)); in.skip(3); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2009-09-17 09:41:56 UTC (rev 415) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2009-09-29 16:44:36 UTC (rev 416) @@ -17,7 +17,6 @@ package org.nuiton.jrst; -import junit.framework.TestCase; import org.dom4j.Document; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; @@ -25,6 +24,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; +import org.junit.Test; /** * JRSTReaderTest. @@ -37,8 +37,9 @@ * Last update: $Date$ * by : $Author$ */ -public class JRSTReaderTest extends TestCase { +public class JRSTReaderTest { + @Test public void testRead() throws Exception { URL url = JRSTReaderTest.class .getResource("/test.rst"); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2009-09-17 09:41:56 UTC (rev 415) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2009-09-29 16:44:36 UTC (rev 416) @@ -38,7 +38,7 @@ } @Test - public void testToRst() throws Exception { + public void generateRst() throws Exception { File in = new File(testBasedir, "toRst1-in.rst"); List<String> IN_LINES = Arrays.asList(new String[]{ @@ -86,4 +86,15 @@ } } + + @Test + public void generateHtml() throws Exception { + + File in = new File(basedir, "src/test/resources/text.rst"); + + File out = new File(testBasedir, "jrst-RstToHtml2.html"); + + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-17 09:41:56 UTC (rev 415) +++ trunk/pom.xml 2009-09-29 16:44:36 UTC (rev 416) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.1</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>jrst</artifactId> @@ -43,6 +43,67 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + + </exclusions> </dependency> <dependency> @@ -67,11 +128,21 @@ </dependency> <dependency> + <groupId>xalan</groupId> + <artifactId>serializer</artifactId> + <version>2.7.1</version> + <scope>runtime</scope> + </dependency> + +  + +  <dependency> <groupId>org.nuiton.thirdparty</groupId> @@ -108,13 +179,6 @@ </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven.version}</version> @@ -145,7 +209,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency> @@ -247,13 +311,13 @@ </build> - <repositories> +

1 0

r415 - trunk/jrst/src/main/resources/xsl
by echatellier＠users.nuiton.org Sept. 17, 2009

Sept. 17, 2009

Author: echatellier Date: 2009-09-17 11:41:56 +0200 (Thu, 17 Sep 2009) New Revision: 415 Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl Log: Update jrst site url Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2009-09-16 08:52:57 UTC (rev 414) +++ trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2009-09-17 09:41:56 UTC (rev 415) @@ -9,7 +9,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <meta name="generator" content="JRST http://jrst.labs.libre-entreprise.org/" /> + <meta name="generator" content="JRST http://maven-site.nuiton.org/jrst" /> <title><xsl:value-of select="title"/></title> </head> <body>

1 0

r414 - in trunk: . jrst
by sletellier＠users.nuiton.org Sept. 16, 2009

Sept. 16, 2009

Author: sletellier Date: 2009-09-16 10:52:57 +0200 (Wed, 16 Sep 2009) New Revision: 414 Modified: trunk/jrst/pom.xml trunk/pom.xml Log: Adding labs repository Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2009-09-16 08:40:11 UTC (rev 413) +++ trunk/jrst/pom.xml 2009-09-16 08:52:57 UTC (rev 414) @@ -42,6 +42,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xml-serializer</artifactId> + <scope>compile</scope> </dependency>  <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-16 08:40:11 UTC (rev 413) +++ trunk/pom.xml 2009-09-16 08:52:57 UTC (rev 414) @@ -247,6 +247,15 @@ </build> + <repositories> + <repository> + <id>labs</id> + <name>lutinbuilder</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2/</url> + </repository> + </repositories> + +

1 0

r413 - in trunk: . jrst
by sletellier＠users.nuiton.org Sept. 16, 2009

Sept. 16, 2009

Author: sletellier Date: 2009-09-16 10:40:11 +0200 (Wed, 16 Sep 2009) New Revision: 413 Modified: trunk/jrst/pom.xml trunk/pom.xml Log: Adding xml-serializer dependency Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2009-09-14 15:26:16 UTC (rev 412) +++ trunk/jrst/pom.xml 2009-09-16 08:40:11 UTC (rev 413) @@ -39,6 +39,10 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>fop</artifactId> </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xml-serializer</artifactId> + </dependency>  <dependency> <groupId>uk.co.flamingpenguin.jewelcli</groupId> @@ -48,7 +52,6 @@ <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> -  </dependency>  <dependency> @@ -60,7 +63,6 @@ <dependency> <groupId>org.docbook</groupId> <artifactId>docbook-xsl</artifactId> -  </dependency>  <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-14 15:26:16 UTC (rev 412) +++ trunk/pom.xml 2009-09-16 08:40:11 UTC (rev 413) @@ -67,6 +67,13 @@ </dependency> <dependency> + <groupId>xerces</groupId> + <artifactId>xml-serializer</artifactId> + <version>2.7.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>sdoc</artifactId> <version>0.5.0-beta-patchcl</version>

1 0

r412 - trunk
by echatellier＠users.nuiton.org Sept. 14, 2009

Sept. 14, 2009

Author: echatellier Date: 2009-09-14 17:26:16 +0200 (Mon, 14 Sep 2009) New Revision: 412 Modified: trunk/changelog.txt Log: Update comment Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-09-14 15:25:38 UTC (rev 411) +++ trunk/changelog.txt 2009-09-14 15:26:16 UTC (rev 412) @@ -1,3 +1,7 @@ +1.0.1 xxx 200909xx + + * Add port in url regex + 1.0.0 chemit 20090823 * add a jrst-doc module

1 0

r411 - trunk/jrst/src/main/java/org/nuiton/jrst
by echatellier＠users.nuiton.org Sept. 14, 2009

Sept. 14, 2009

Author: echatellier Date: 2009-09-14 17:25:38 +0200 (Mon, 14 Sep 2009) New Revision: 411 Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java Log: Add port in url regex Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2009-08-26 17:09:32 UTC (rev 410) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2009-09-14 15:25:38 UTC (rev 411) @@ -179,9 +179,9 @@ .compile("\\*\\*(.+?)\\*\\*"); public static final Pattern REGEX_LITERAL = Pattern.compile("``([^`]+)``"); public static final Pattern REGEX_REFERENCE = Pattern - .compile("(http://[-/%#[\\&&&[^(>)]]\\._\\w]+\\w+)((\\W|&|$)+)"); + .compile("(http://[-/%#[\\&&&[^(>)]]\\._\\w:]+\\w+)((\\W|&|$)+)"); public static final Pattern REGEX_INLINE_REFERENCE = Pattern - .compile("`(.+) \\&lt\\;(http://[-/%#&\\._\\w]+)(\\&gt\\;)`_"); + .compile("`(.+) \\&lt\\;(http://[-/%#&\\._\\w:]+)(\\&gt\\;)`_"); public static final Pattern REGEX_EMAIL = Pattern .compile("(^|[^_\\w])([-\\._\\w]+(a)[-\\._\\w]+)([^-\\._\\w]|$)"); public static final Pattern REGEX_FOOTNOTE_REFERENCE = Pattern

1 0