r627 - in trunk: doxia-module-jrst doxia-module-jrst/src/main/java/org/nuiton/jrst jrst/src/main/java/org/nuiton/jrst
Author: sletellier Date: 2011-11-29 10:13:20 +0100 (Tue, 29 Nov 2011) New Revision: 627 Url: http://nuiton.org/repositories/revision/jrst/627 Log: Fix test in fail Modified: trunk/doxia-module-jrst/pom.xml trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-11-28 22:21:16 UTC (rev 626) +++ trunk/doxia-module-jrst/pom.xml 2011-11-29 09:13:20 UTC (rev 627) @@ -88,7 +88,7 @@ <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> - <scope>runtime</scope> + <!--<scope>runtime</scope>--> </dependency> <dependency> 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 2011-11-28 22:21:16 UTC (rev 626) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2011-11-29 09:13:20 UTC (rev 627) @@ -25,10 +25,8 @@ package org.nuiton.jrst; -import java.io.FileNotFoundException; import java.io.Reader; import java.io.StringReader; -import java.net.URL; import org.apache.maven.doxia.module.xdoc.XdocParser; import org.apache.maven.doxia.parser.ParseException; @@ -46,8 +44,6 @@ */ public class JrstParser extends XdocParser { - protected final static String RST2XDOC = "/xsl/rst2xdoc.xsl"; - @Override public void parse(Reader source, Sink sink) throws ParseException { @@ -58,13 +54,7 @@ Document doc = jrst.read(source); // Apply xsl on rst RST Document - JRSTGenerator gen = new JRSTGenerator(); - URL stylesheet = JrstParser.class.getResource(RST2XDOC); - if (stylesheet == null) { - throw new FileNotFoundException("Can't find stylesheet: " - + RST2XDOC); - } - doc = gen.transform(doc, stylesheet); + doc = JRST.applyXsls(doc, JRST.rst2xdoc); // Give xsl result to XDoc parser Reader reader = new StringReader(doc.asXML()); Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-11-28 22:21:16 UTC (rev 626) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-11-29 09:13:20 UTC (rev 627) @@ -396,13 +396,9 @@ } return doc.asXML(); } - - - + protected static Document applyXsls(Document doc, String xslListOrOutType) throws IOException, FileNotFoundException, TransformerException { - private static Document applyXsls(Document doc, String xslListOrOutType) throws IOException, FileNotFoundException, TransformerException { - // search xsl file list to apply String xslList = stylesheets.get(xslListOrOutType); if (xslListOrOutType == null) {
participants (1)
-
sletellier@users.nuiton.org