Author: tchemit Date: 2009-05-11 05:57:17 +0000 (Mon, 11 May 2009) New Revision: 320 Modified: doxia-module-jrst/trunk/changelog.txt doxia-module-jrst/trunk/pom.xml doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java doxia-module-jrst/trunk/src/site/site.xml doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java Log: * Bump versions (lutinproject 3.5.4, jrst 0.8.6) * add Override annotations Modified: doxia-module-jrst/trunk/changelog.txt =================================================================== --- doxia-module-jrst/trunk/changelog.txt 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/changelog.txt 2009-05-11 05:57:17 UTC (rev 320) @@ -1,3 +1,11 @@ +doxia-module-jrst (1.1.0) ? + + * migrate to nuiton + +doxia-module-jrst (1.0.1) chemit 20090511 + + * Bump versions (lutinproject 3.5.4, jrst 0.8.6) + doxia-module-jrst (1.0.0) chemit * Initial release \ No newline at end of file Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/pom.xml 2009-05-11 05:57:17 UTC (rev 320) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4</version> + <version>3.5.4</version> </parent> <artifactId>doxia-module-jrst</artifactId> @@ -26,7 +26,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>jrst</artifactId> - <version>0.8.5</version> + <version>0.8.6</version> <scope>compile</scope> <exclusions> <exclusion> @@ -35,13 +35,13 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <type>test-jar</type> - <version>${doxia.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <type>test-jar</type> + <version>${doxia.version}</version> + <scope>test</scope> + </dependency> </dependencies> <!-- ************************************************************* --> @@ -93,10 +93,10 @@ </descriptors> </configuration> <executions> - <execution> + <execution> <goals> - <goal>descriptor</goal> - <goal>merge-descriptors</goal> + <goal>descriptor</goal> + <goal>merge-descriptors</goal> </goals> </execution> </executions> @@ -104,7 +104,7 @@ </plugins> </build> - <reporting> + <reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java =================================================================== --- doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java 2009-05-11 05:57:17 UTC (rev 320) @@ -41,7 +41,7 @@ protected final static String RST2XDOC = "/xsl/rst2xdoc.xsl"; - /** {@inheritDoc} */ + @Override public void parse(Reader source, Sink sink) throws ParseException { try { Modified: doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java =================================================================== --- doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java 2009-05-11 05:57:17 UTC (rev 320) @@ -29,17 +29,17 @@ */ public class JrstSiteModule extends AbstractSiteModule { - /** {@inheritDoc} */ + @Override public String getSourceDirectory() { return "rst"; } - /** {@inheritDoc} */ + @Override public String getExtension() { return "rst"; } - /** {@inheritDoc} */ + @Override public String getParserId() { return "jrst"; } Modified: doxia-module-jrst/trunk/src/site/site.xml =================================================================== --- doxia-module-jrst/trunk/src/site/site.xml 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/site/site.xml 2009-05-11 05:57:17 UTC (rev 320) @@ -26,10 +26,11 @@ <body> <links> <item name="JRst" href="http://jrst.labs.libre-entreprise.org/"/> + <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/maven-jrst-plugin/"/> <item name="Labs" href="http://labs.libre-entreprise.org/"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> - <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/> - <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/> + <!--item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/> + <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/--> </links> <menu name="User"> Modified: doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java =================================================================== --- doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java 2009-05-11 05:35:52 UTC (rev 319) +++ doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java 2009-05-11 05:57:17 UTC (rev 320) @@ -33,14 +33,14 @@ protected JrstParser parser; - /** @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); parser = (JrstParser) lookup(Parser.ROLE, "jrst"); } - /** @see org.apache.maven.doxia.parser.AbstractParserTest#createParser() */ + @Override protected Parser createParser() { return parser; } @@ -54,7 +54,7 @@ output = new StringWriter(); reader = getTestReader("test", "rst"); - Sink sink = new XdocSink(output); + Sink sink = new XdocSink(output) {}; createParser().parse(reader, sink); /* FIXME output is null :( @@ -68,7 +68,7 @@ } } - /** {@inheritDoc} */ + @Override protected String outputExtension() { return "rst"; }