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

r629 - trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 29 Nov '11

29 Nov '11

Author: sletellier Date: 2011-11-29 18:40:02 +0100 (Tue, 29 Nov 2011) New Revision: 629 Url: http://nuiton.org/repositories/revision/jrst/629 Log: Use JRSTResourceResolver to transform to xdoc Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 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-29 17:38:54 UTC (rev 628) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2011-11-29 17:40:02 UTC (rev 629) @@ -25,13 +25,16 @@ 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; import org.apache.maven.doxia.sink.Sink; import org.dom4j.Document; +import org.nuiton.util.Resource; /** * Parse an RST model, transform it into xdoc model and emit events into the @@ -54,8 +57,20 @@ Document doc = jrst.read(source); // Apply xsl on rst RST Document - doc = JRST.applyXsls(doc, JRST.rst2xdoc); + JRSTGenerator gen = new JRSTGenerator(); + String xsl = JRST.rst2xdoc; + URL stylesheet = Resource.getURL(xsl); + if (stylesheet == null) { + throw new FileNotFoundException("Can't find stylesheet: " + + xsl); + } + // add entity resolver + gen.setUriResolver(new JRSTResourceResolver(xsl)); + + // do transformation + doc = gen.transform(doc, stylesheet); + // Give xsl result to XDoc parser Reader reader = new StringReader(doc.asXML()); super.parse(reader, sink);

1 0

r628 - trunk/jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 29 Nov '11

29 Nov '11

Author: sletellier Date: 2011-11-29 18:38:54 +0100 (Tue, 29 Nov 2011) New Revision: 628 Url: http://nuiton.org/repositories/revision/jrst/628 Log: Introduce JRSTResourceResolver extends FasterCachedResourceResolver and if not found, resolve in xsl Added: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-11-29 09:13:20 UTC (rev 627) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-11-29 17:38:54 UTC (rev 628) @@ -22,7 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - package org.nuiton.jrst; import java.awt.GraphicsDevice; @@ -34,20 +33,14 @@ import java.util.Locale; import java.util.Map; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; -import javax.xml.transform.URIResolver; import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -64,10 +57,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; import org.nuiton.util.StringUtil; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; /** * FIXME: 'JRST --help' doesn't work, but 'JRST --help toto' work :( FIXME: @@ -397,7 +386,7 @@ 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, TransformerException { // search xsl file list to apply String xslList = stylesheets.get(xslListOrOutType); @@ -422,74 +411,10 @@ + xsl); } - final String finalXsl = xsl; - // add entity resolver - gen.setUriResolver(new URIResolver() { - public Source resolve(String href, String base) { - if (log.isDebugEnabled()) { - log.debug("RESOLVING: href: "+href+" base: "+base); - } - String xslDir = finalXsl.substring(0, finalXsl.lastIndexOf('/') + 1); - String resouceFullName = xslDir + href; + gen.setUriResolver(new JRSTResourceResolver(xsl)); - if (log.isDebugEnabled()) { - log.debug("RESOLVING: resouceFullName: "+resouceFullName); - } - - try { - InputStream stream = null; - File file = new File(resouceFullName); - if (file.exists()) { - stream = new FileInputStream(file); - } else { - try { - stream = Resource.getURL(resouceFullName).openStream(); - } - catch (Exception e) { - stream = Resource.getURL("/docbook/common/" + href).openStream(); - } - } - - SAXParserFactory parserFactory = SAXParserFactory.newInstance(); - SAXParser saxParser = parserFactory.newSAXParser(); - XMLReader xmlReader = saxParser.getXMLReader(); - xmlReader.setEntityResolver(new EntityResolver() { - @Override - public InputSource resolveEntity(String publicId, String systemId) - throws SAXException, IOException { - - InputSource source = null; - - String smallSystemId = systemId.substring(systemId.lastIndexOf("/") + 1); - URL url = Resource.getURL("/docbook/common/" + smallSystemId); - if (url != null) { - if (log.isDebugEnabled()) { - log.debug("Resolved entity url : " + url); - } - InputStream stream = url.openStream(); - source = new InputSource(stream); - } - - return source; - } - }); - InputSource inSrc = new InputSource(stream); - SAXSource saxs = new SAXSource(xmlReader, inSrc); - return saxs; - } catch (IOException e) { - e.printStackTrace(); - return null; - } catch (ParserConfigurationException e) { - e.printStackTrace(); - return null; - } catch (SAXException e) { - e.printStackTrace(); - return null; - } - } - }); - + // do transformation doc = gen.transform(doc, stylesheet); } return doc; Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-11-29 09:13:20 UTC (rev 627) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-11-29 17:38:54 UTC (rev 628) @@ -57,14 +57,11 @@ import static org.nuiton.jrst.ReStructuredText.TRANSITION; import static org.nuiton.jrst.ReStructuredText.VERSION; -import java.io.File; import java.io.IOException; import java.io.Writer; -import java.net.MalformedURLException; import java.net.URL; import java.util.LinkedList; -import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; @@ -83,9 +80,6 @@ import org.dom4j.io.DocumentSource; import org.nuiton.util.FasterCachedResourceResolver; import org.xml.sax.ContentHandler; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; /** * Cette classe contient plusieurs methodes pour générer, soit en utilisant une Added: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java (rev 0) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java 2011-11-29 17:38:54 UTC (rev 628) @@ -0,0 +1,108 @@ +package org.nuiton.jrst; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FasterCachedResourceResolver; +import org.nuiton.util.Resource; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.Source; +import javax.xml.transform.sax.SAXSource; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +/** + * @author sletellier <letellier(a)codelutin.com> + * @since 1.5 + */ +public class JRSTResourceResolver extends FasterCachedResourceResolver { + + static private Log log = LogFactory.getLog(JRSTResourceResolver.class); + + protected String xsl; + + public JRSTResourceResolver(String xsl) { + this.xsl = xsl; + } + + @Override + public Source resolve(String href, String base) { + + // Try first with faster resource resolver + Source resolved = super.resolve(href, base); + if (resolved != null) { + return resolved; + } + + // If not found, try to find in xsl + if (log.isDebugEnabled()) { + log.debug("RESOLVING: href: "+href+" base: "+base); + } + String xslDir = xsl.substring(0, xsl.lastIndexOf('/') + 1); + String resouceFullName = xslDir + href; + + if (log.isDebugEnabled()) { + log.debug("RESOLVING: resouceFullName: "+resouceFullName); + } + + try { + InputStream stream = null; + File file = new File(resouceFullName); + if (file.exists()) { + stream = new FileInputStream(file); + } else { + try { + stream = Resource.getURL(resouceFullName).openStream(); + } + catch (Exception e) { + stream = Resource.getURL("/docbook/common/" + href).openStream(); + } + } + + SAXParserFactory parserFactory = SAXParserFactory.newInstance(); + SAXParser saxParser = parserFactory.newSAXParser(); + XMLReader xmlReader = saxParser.getXMLReader(); + xmlReader.setEntityResolver(new EntityResolver() { + @Override + public InputSource resolveEntity(String publicId, String systemId) + throws SAXException, IOException { + + InputSource source = null; + + String smallSystemId = systemId.substring(systemId.lastIndexOf("/") + 1); + URL url = Resource.getURL("/docbook/common/" + smallSystemId); + if (url != null) { + if (log.isDebugEnabled()) { + log.debug("Resolved entity url : " + url); + } + InputStream stream = url.openStream(); + source = new InputSource(stream); + } + + return source; + } + }); + InputSource inSrc = new InputSource(stream); + SAXSource saxs = new SAXSource(xmlReader, inSrc); + return saxs; + } catch (IOException e) { + e.printStackTrace(); + return null; + } catch (ParserConfigurationException e) { + e.printStackTrace(); + return null; + } catch (SAXException e) { + e.printStackTrace(); + return null; + } + } +}

1 0

r627 - in trunk: doxia-module-jrst doxia-module-jrst/src/main/java/org/nuiton/jrst jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org 29 Nov '11

29 Nov '11

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> +  </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) {

1 0

r626 - trunk
by maven-release＠users.nuiton.org 28 Nov '11

28 Nov '11

Author: maven-release Date: 2011-11-28 23:21:16 +0100 (Mon, 28 Nov 2011) New Revision: 626 Url: http://nuiton.org/repositories/revision/jrst/626 Log: Update mavenpom4redmineAndCentral to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 21:25:19 UTC (rev 625) +++ trunk/pom.xml 2011-11-28 22:21:16 UTC (rev 626) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <artifactId>jrst</artifactId>

1 0

r625 - trunk
by maven-release＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: maven-release Date: 2011-10-28 23:25:19 +0200 (Fri, 28 Oct 2011) New Revision: 625 Url: http://nuiton.org/repositories/revision/jrst/625 Log: Update mavenpom4redmineAndCentral to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 15:03:30 UTC (rev 624) +++ trunk/pom.xml 2011-10-28 21:25:19 UTC (rev 625) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <artifactId>jrst</artifactId>

1 0

r624 - in trunk/jrst/src: main/java/org/nuiton/jrst main/resources test/resources
by sletellier＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: sletellier Date: 2011-10-28 17:03:30 +0200 (Fri, 28 Oct 2011) New Revision: 624 Url: http://nuiton.org/repositories/revision/jrst/624 Log: - Replace DocumentResolver by FasterCachedResourceResolver - Fix #1661 : Error with RST transformation in MS Windows Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/jrst/src/main/resources/log4j.properties trunk/jrst/src/test/resources/log4j.properties Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-10-28 14:10:56 UTC (rev 623) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-10-28 15:03:30 UTC (rev 624) @@ -26,7 +26,36 @@ package org.nuiton.jrst; -import static org.nuiton.jrst.ReStructuredText.*; +import static org.nuiton.jrst.ReStructuredText.ADDRESS; +import static org.nuiton.jrst.ReStructuredText.AUTHOR; +import static org.nuiton.jrst.ReStructuredText.AUTHORS; +import static org.nuiton.jrst.ReStructuredText.BULLET_LIST; +import static org.nuiton.jrst.ReStructuredText.CLASSIFIER; +import static org.nuiton.jrst.ReStructuredText.CONTACT; +import static org.nuiton.jrst.ReStructuredText.COPYRIGHT; +import static org.nuiton.jrst.ReStructuredText.DATE; +import static org.nuiton.jrst.ReStructuredText.DEFINITION; +import static org.nuiton.jrst.ReStructuredText.DEFINITION_LIST; +import static org.nuiton.jrst.ReStructuredText.DOCINFO; +import static org.nuiton.jrst.ReStructuredText.EMPHASIS; +import static org.nuiton.jrst.ReStructuredText.ENUMERATED_LIST; +import static org.nuiton.jrst.ReStructuredText.FIELD_BODY; +import static org.nuiton.jrst.ReStructuredText.FIELD_LIST; +import static org.nuiton.jrst.ReStructuredText.FIELD_NAME; +import static org.nuiton.jrst.ReStructuredText.LIST_ITEM; +import static org.nuiton.jrst.ReStructuredText.LITERAL; +import static org.nuiton.jrst.ReStructuredText.LITERAL_BLOCK; +import static org.nuiton.jrst.ReStructuredText.ORGANIZATION; +import static org.nuiton.jrst.ReStructuredText.PARAGRAPH; +import static org.nuiton.jrst.ReStructuredText.REVISION; +import static org.nuiton.jrst.ReStructuredText.SECTION; +import static org.nuiton.jrst.ReStructuredText.STATUS; +import static org.nuiton.jrst.ReStructuredText.STRONG; +import static org.nuiton.jrst.ReStructuredText.TABLE; +import static org.nuiton.jrst.ReStructuredText.TITLE; +import static org.nuiton.jrst.ReStructuredText.TITLE_CHAR; +import static org.nuiton.jrst.ReStructuredText.TRANSITION; +import static org.nuiton.jrst.ReStructuredText.VERSION; import java.io.File; import java.io.IOException; @@ -52,6 +81,7 @@ import org.dom4j.Text; import org.dom4j.io.DocumentResult; import org.dom4j.io.DocumentSource; +import org.nuiton.util.FasterCachedResourceResolver; import org.xml.sax.ContentHandler; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -181,7 +211,7 @@ if (uriResolver != null) { factory.setURIResolver(uriResolver); } else { - factory.setURIResolver(new DocumentResolver(stylesheet)); + factory.setURIResolver(new FasterCachedResourceResolver(stylesheet.toString())); } Transformer transformer = factory.newTransformer(new StreamSource( stylesheet.openStream())); @@ -216,7 +246,7 @@ if (uriResolver != null) { factory.setURIResolver(uriResolver); } else { - factory.setURIResolver(new DocumentResolver(stylesheet)); + factory.setURIResolver(new FasterCachedResourceResolver(stylesheet.toString())); } Transformer transformer = factory.newTransformer(new StreamSource( @@ -233,59 +263,6 @@ return transformedDoc; } - static public class DocumentResolver implements URIResolver, EntityResolver { - - URL baseURL; - - public DocumentResolver(URL url) throws MalformedURLException { - String path = new File(url.getPath()).getParent(); - baseURL = new URL(url.getProtocol(), url.getHost(), url.getPort(), - path); - } - - @Override - public Source resolve(String href, String base) - throws TransformerException { - try { - URL url = null; - if (href == null) { - url = baseURL; - } else { - String path = baseURL.getPath(); - if (path.startsWith("file:")) { - path = "file:" - + new File(path.substring("file:".length()), - href).getCanonicalPath(); - } else { - path = new File(path, href).getCanonicalPath(); - } - url = new URL(baseURL.getProtocol(), baseURL.getHost(), - baseURL.getPort(), path); - } - log.debug("** resolve href: '" + href + "' base: '" + base - + "' return: '" + url + "'"); - Source result = new StreamSource(url.openStream()); - return result; - } catch (MalformedURLException eee) { - throw new TransformerException("Can't create url ", eee); - } catch (IOException eee) { - throw new TransformerException("Can't read url", eee); - } - } - - /* - * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String) - */ - @Override - public InputSource resolveEntity(String publicId, String systemId) - throws SAXException, IOException { - log.debug("## resolveEntity publicId '" + publicId - + "' systemId: '" + systemId + "'"); - return null; - } - - } - protected String string(String s, int number) { String result = ""; for (int i = 0; i < number; i++) { Modified: trunk/jrst/src/main/resources/log4j.properties =================================================================== --- trunk/jrst/src/main/resources/log4j.properties 2011-10-28 14:10:56 UTC (rev 623) +++ trunk/jrst/src/main/resources/log4j.properties 2011-10-28 15:03:30 UTC (rev 624) @@ -23,7 +23,7 @@ # #L% ### # Global logging configuration -log4j.rootLogger=WARN, stdout +log4j.rootLogger=INFO, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender @@ -31,4 +31,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=WARN +log4j.logger.org.nuiton.jrst=INFO Modified: trunk/jrst/src/test/resources/log4j.properties =================================================================== --- trunk/jrst/src/test/resources/log4j.properties 2011-10-28 14:10:56 UTC (rev 623) +++ trunk/jrst/src/test/resources/log4j.properties 2011-10-28 15:03:30 UTC (rev 624) @@ -23,7 +23,7 @@ # #L% ### # Global logging configuration -log4j.rootLogger=ERROR, stdout +log4j.rootLogger=INFO, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

1 0

r623 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by sletellier＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: sletellier Date: 2011-10-28 16:10:56 +0200 (Fri, 28 Oct 2011) New Revision: 623 Url: http://nuiton.org/repositories/revision/jrst/623 Log: #1788 Option argument not parsed Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-10-27 11:39:00 UTC (rev 622) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-10-28 14:10:56 UTC (rev 623) @@ -764,7 +764,8 @@ option_argument = matcher.group().substring(1, matcher.group().length()); option.addAttribute(OPTIONARGUMENT, option_argument); - if (option_stringTmp.charAt(option_argument.length() + 1) == ',') { + int size = option_argument.length() + 1; + if (option_stringTmp.length() < size && option_stringTmp.charAt(size) == ',') { delimiter = ','; } else { done = true; Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/OptionTest.java 2011-10-28 14:10:56 UTC (rev 623) @@ -0,0 +1,43 @@ +package org.nuiton.jrst.bugs; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; + +import java.io.File; +import java.io.IOException; + +/** + * Test concernant les options. + * + * @author sletellier + */ +public class OptionTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(AdmonitionTest.class); + + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + + /** + * Test que les options des options dans des listes sont bien parsée + * parsées. + * + * @throws Exception + */ + @Test + public void testOptionArgumentSizeInList() throws Exception { + File in = new File("src/test/resources/bugs/testOptionArgumentSize1788.rst"); + File out = File.createTempFile("jrst-testOptionArgumentSize1788", ".html"); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + } + +} Added: trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testOptionArgumentSize1788.rst 2011-10-28 14:10:56 UTC (rev 623) @@ -0,0 +1,2 @@ + +--import <file.zip>

1 0

r622 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by sletellier＠users.nuiton.org 27 Oct '11

27 Oct '11

Author: sletellier Date: 2011-10-27 13:39:00 +0200 (Thu, 27 Oct 2011) New Revision: 622 Url: http://nuiton.org/repositories/revision/jrst/622 Log: - #1787 Admonition not parsed - Create test Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-09-22 17:25:48 UTC (rev 621) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-10-27 11:39:00 UTC (rev 622) @@ -1089,7 +1089,7 @@ String line = in.readLine(); if (line != null) { String lineTest = line.toLowerCase(); - Pattern pAdmonition = Pattern.compile("^\\.\\.\\s*(" + Pattern pAdmonition = Pattern.compile("^\\s*\\.\\.\\s(" + ADMONITION_PATTERN + ")::\\s*(.*)$"); Matcher matcher = pAdmonition.matcher(lineTest); Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/AdmonitionTest.java 2011-10-27 11:39:00 UTC (rev 622) @@ -0,0 +1,49 @@ +package org.nuiton.jrst.bugs; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; + +import java.io.File; +import java.io.IOException; + +/** + * Test concernant les admonitions. + * + * @author sletellier + */ +public class AdmonitionTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(AdmonitionTest.class); + + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + + /** + * Test que les options des admonitions dans des listes sont bien parsée + * parsées. + * + * @throws Exception + */ + @Test + public void testAdmonitionInList() throws Exception { + File in = new File("src/test/resources/bugs/testAdminitionInList1787.rst"); + File out = File.createTempFile("jrst-testAdminitionInList1787", ".html"); +// out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + +// Must contains <div class="note"> + Assert.assertTrue(content.contains("<div class=\"note\">")); + } + +} Added: trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testAdminitionInList1787.rst 2011-10-27 11:39:00 UTC (rev 622) @@ -0,0 +1,5 @@ +* item + + .. Note:: note + +* item2

1 0

r621 - trunk
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 19:25:48 +0200 (Thu, 22 Sep 2011) New Revision: 621 Url: http://nuiton.org/repositories/revision/jrst/621 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:05:16 UTC (rev 620) +++ trunk/pom.xml 2011-09-22 17:25:48 UTC (rev 621) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <artifactId>jrst</artifactId>

1 0

r620 - trunk
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 18:05:16 +0200 (Fri, 09 Sep 2011) New Revision: 620 Url: http://nuiton.org/repositories/revision/jrst/620 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:50:21 UTC (rev 619) +++ trunk/pom.xml 2011-09-09 16:05:16 UTC (rev 620) @@ -411,6 +411,13 @@ <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <profiles>  <profile>

1 0