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

r439 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 18:09:39 +0100 (Tue, 19 Jan 2010) New Revision: 439 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.1.0 Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-01-19 16:52:02 UTC (rev 438) +++ trunk/doxia-module-jrst/pom.xml 2010-01-19 17:09:39 UTC (rev 439) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-01-19 16:52:02 UTC (rev 438) +++ trunk/jrst/pom.xml 2010-01-19 17:09:39 UTC (rev 439) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-01-19 16:52:02 UTC (rev 438) +++ trunk/jrst-doc/pom.xml 2010-01-19 17:09:39 UTC (rev 439) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-01-19 16:52:02 UTC (rev 438) +++ trunk/maven-jrst-plugin/pom.xml 2010-01-19 17:09:39 UTC (rev 439) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 16:52:02 UTC (rev 438) +++ trunk/pom.xml 2010-01-19 17:09:39 UTC (rev 439) @@ -13,7 +13,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1.0</version> <modules> <module>jrst</module> @@ -321,9 +321,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.1.0</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.1.0</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.1.0</url> </scm> </project>

1 0

r438 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 17:52:02 +0100 (Tue, 19 Jan 2010) New Revision: 438 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 2010-01-19 16:51:59 UTC (rev 437) +++ trunk/doxia-module-jrst/pom.xml 2010-01-19 16:52:02 UTC (rev 438) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-01-19 16:51:59 UTC (rev 437) +++ trunk/jrst/pom.xml 2010-01-19 16:52:02 UTC (rev 438) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-01-19 16:51:59 UTC (rev 437) +++ trunk/jrst-doc/pom.xml 2010-01-19 16:52:02 UTC (rev 438) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-01-19 16:51:59 UTC (rev 437) +++ trunk/maven-jrst-plugin/pom.xml 2010-01-19 16:52:02 UTC (rev 438) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 16:51:59 UTC (rev 437) +++ trunk/pom.xml 2010-01-19 16:52:02 UTC (rev 438) @@ -13,7 +13,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> <modules> <module>jrst</module> @@ -321,9 +321,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.0.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.0.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.0.1</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

r437 - tags
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 17:51:59 +0100 (Tue, 19 Jan 2010) New Revision: 437 Added: tags/jrst-1.0.1/ Log: [maven-scm] copy for tag jrst-1.0.1

1 0

r436 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 17:51:56 +0100 (Tue, 19 Jan 2010) New Revision: 436 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.1 Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-01-19 16:48:16 UTC (rev 435) +++ trunk/doxia-module-jrst/pom.xml 2010-01-19 16:51:56 UTC (rev 436) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-01-19 16:48:16 UTC (rev 435) +++ trunk/jrst/pom.xml 2010-01-19 16:51:56 UTC (rev 436) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2010-01-19 16:48:16 UTC (rev 435) +++ trunk/jrst-doc/pom.xml 2010-01-19 16:51:56 UTC (rev 436) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-01-19 16:48:16 UTC (rev 435) +++ trunk/maven-jrst-plugin/pom.xml 2010-01-19 16:51:56 UTC (rev 436) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 16:48:16 UTC (rev 435) +++ trunk/pom.xml 2010-01-19 16:51:56 UTC (rev 436) @@ -13,7 +13,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> <modules> <module>jrst</module> @@ -321,9 +321,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.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.0.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.0.1</url> </scm> </project>

1 0

r435 - trunk
by tchemit＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: tchemit Date: 2010-01-19 17:48:16 +0100 (Tue, 19 Jan 2010) New Revision: 435 Modified: trunk/pom.xml Log: stay on mavenpom 2.0.1 + remove pluginManagments dealed by mavenpom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 13:21:57 UTC (rev 434) +++ trunk/pom.xml 2010-01-19 16:48:16 UTC (rev 435) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.1</version> </parent> <artifactId>jrst</artifactId> @@ -296,12 +296,6 @@ <plugins> <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - - <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version>

1 0

r434 - trunk
by sletellier＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: sletellier Date: 2010-01-19 14:21:57 +0100 (Tue, 19 Jan 2010) New Revision: 434 Modified: trunk/pom.xml Log: Up to mavenpom 2.0.2-SNAPSHOT Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-19 13:05:36 UTC (rev 433) +++ trunk/pom.xml 2010-01-19 13:21:57 UTC (rev 434) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <artifactId>jrst</artifactId>

1 0

r433 - trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: sletellier Date: 2010-01-19 14:05:36 +0100 (Tue, 19 Jan 2010) New Revision: 433 Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java Log: Fix bug 174 : Test of AbstractParserTest failed so JrstParserTest extends now AbstractModuleTest class 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-01-19 11:37:38 UTC (rev 432) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-01-19 13:05:36 UTC (rev 433) @@ -60,7 +60,7 @@ doc = gen.transform(doc, stylesheet); // Give xsl result to XDoc parser - Readerr = new StringReader(doc.asXML()); + Reader reader = new StringReader(doc.asXML()); super.parse(reader, sink); } catch (Exception e) { throw new ParseException("Can't parse rst file", e);

1 0

r432 - in trunk: doxia-module-jrst/src/main/java/org/nuiton/jrst doxia-module-jrst/src/test/java/org/nuiton/jrst jrst/src/main/resources/xsl
by sletellier＠users.nuiton.org 19 Jan '10

19 Jan '10

Author: sletellier Date: 2010-01-19 12:37:38 +0100 (Tue, 19 Jan 2010) New Revision: 432 Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl Log: Fix bug 174 : Test of AbstractParserTest failed so JrstParserTest extends now AbstractModuleTest class 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-01-17 20:14:31 UTC (rev 431) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-01-19 11:37:38 UTC (rev 432) @@ -60,7 +60,7 @@ doc = gen.transform(doc, stylesheet); // Give xsl result to XDoc parser - Reader reader = new StringReader(doc.asXML()); + Readerr = new StringReader(doc.asXML()); super.parse(reader, sink); } catch (Exception e) { throw new ParseException("Can't parse rst file", e); Modified: trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java =================================================================== --- trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java 2010-01-17 20:14:31 UTC (rev 431) +++ trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java 2010-01-19 11:37:38 UTC (rev 432) @@ -17,19 +17,23 @@ package org.nuiton.jrst; +import java.io.InputStream; +import java.io.InputStreamReader; import java.io.Reader; import java.io.StringWriter; +import org.apache.maven.doxia.AbstractModuleTest; import org.apache.maven.doxia.module.xdoc.XdocSink; import org.apache.maven.doxia.parser.AbstractParserTest; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; +import org.codehaus.plexus.PlexusTestCase; /** * @author chatellier * @version $Revision : 1$ */ -public class JrstParserTest extends AbstractParserTest { +public class JrstParserTest extends AbstractModuleTest { protected JrstParser parser; @@ -40,12 +44,7 @@ parser = (JrstParser) lookup(Parser.ROLE, "jrst"); } - @Override - protected Parser createParser() { - return parser; - } - - public void testParseRst() throws Exception { + public void testParse() throws Exception { StringWriter output = null; Reader reader = null; @@ -53,14 +52,13 @@ output = new StringWriter(); reader = getTestReader("test", "rst"); - Sink sink = new XdocSink(output) {}; - createParser().parse(reader, sink); + Sink sink = new XdocSink(output){}; + parser.parse(reader, sink); - /* FIXME output is null :( assertTrue(output.toString().indexOf("emphasis") != -1); assertTrue(output.toString().indexOf("This is the first item") != -1); assertTrue(output.toString().indexOf("Title") != -1); - assertTrue(output.toString().indexOf("blocks.") != -1);*/ + assertTrue(output.toString().indexOf("blocks.") != -1); } finally { if (output != null) { output.close(); @@ -76,4 +74,9 @@ return "rst"; } + @Override + protected String getOutputDir(){ + return "parser/"; + } + } Modified: trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl 2010-01-17 20:14:31 UTC (rev 431) +++ trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl 2010-01-19 11:37:38 UTC (rev 432) @@ -11,10 +11,12 @@ <properties> <title><xsl:value-of select="title"/></title> </properties> - <section> - <xsl:attribute name="name"><xsl:value-of select="title"/></xsl:attribute> - <xsl:apply-templates /> - </section> + <body> + <section> + <xsl:attribute name="name"><xsl:value-of select="title"/></xsl:attribute> + <xsl:apply-templates /> + </section> + </body> </document> </xsl:template>

1 0

r431 - trunk
by tchemit＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: tchemit Date: 2010-01-17 21:14:31 +0100 (Sun, 17 Jan 2010) New Revision: 431 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-10 23:23:02 UTC (rev 430) +++ trunk/pom.xml 2010-01-17 20:14:31 UTC (rev 431) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r430 - trunk
by tchemit＠users.nuiton.org 10 Jan '10

10 Jan '10

Author: tchemit Date: 2010-01-11 00:23:02 +0100 (Mon, 11 Jan 2010) New Revision: 430 Modified: trunk/pom.xml Log: use mavenpom4redmine Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 03:29:28 UTC (rev 429) +++ trunk/pom.xml 2010-01-10 23:23:02 UTC (rev 430) @@ -9,8 +9,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.4</version> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> </parent> <artifactId>jrst</artifactId>

1 0