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

r549 - in trunk/jrst/src: main/java/org/nuiton/jrst main/java/org/nuiton/jrst/directive test/java/org/nuiton/jrst/bugs test/resources/bugs
by echatellier＠users.nuiton.org 07 Mar '11

07 Mar '11

Author: echatellier Date: 2011-03-07 17:23:50 +0100 (Mon, 07 Mar 2011) New Revision: 549 Url: http://nuiton.org/repositories/revision/jrst/549 Log: #21 : Add parameter support for image directive (width, height, ...) Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java trunk/jrst/src/test/resources/bugs/testImages21.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-04 12:37:01 UTC (rev 548) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-07 16:23:50 UTC (rev 549) @@ -1106,7 +1106,7 @@ directive.addAttribute(DIRECTIVE_TYPE, directiveType); directive.addAttribute(DIRECTIVE_VALUE, directiveValue); - String[] lines = readBlock(2); + String[] lines = readBlock(1); String text = joinBlock(lines, "\n", false); directive.setText(text); Modified: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java 2011-03-04 12:37:01 UTC (rev 548) +++ trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java 2011-03-07 16:23:50 UTC (rev 549) @@ -50,6 +50,10 @@ */ public class ImageDirective implements JRSTDirective { + protected static final String SCALE = "scale"; + protected static final String WIDTH = "width"; + protected static final String HEIGHT = "height"; + /* * (non-Javadoc) * @@ -73,6 +77,14 @@ if (matcher.matches()) { String name = matcher.group(1); String value = matcher.group(2); + if (SCALE.equalsIgnoreCase(name)) { + if (!result.asXML().matches(".*" + WIDTH + "=\".*\".*")) { + result.addAttribute(WIDTH, value + (value.matches(".*%") ? "" : "%")); + } + if (!result.asXML().matches(".*" + HEIGHT + "=\".*\".*")) { + result.addAttribute(HEIGHT, value + (value.matches(".*%") ? "" : "%")); + } + } result.addAttribute(name, value); } } Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-03-07 16:23:50 UTC (rev 549) @@ -0,0 +1,68 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.jrst.bugs; + +import java.io.File; + +import org.apache.commons.io.FileUtils; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.jrst.JRST; + +/** + * Test concernant les directives. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class DirectiveTest { + + /** + * Test que les options des directives images sont correctement + * parsées. + * + * @throws Exception + */ + @Test + public void testImageDirectiveOption() throws Exception { + File in = new File("src/test/resources/bugs/testImages21.rst"); + File out = File.createTempFile("jrst-testImages", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + Assert.assertTrue(content.indexOf("alt=\"alternate text\"") > 0); + Assert.assertTrue(content.indexOf("width=\"200 px\"") > 0); + Assert.assertTrue(content.indexOf("align=\"center\"") > 0); + Assert.assertTrue(content.indexOf("alt=\"tab alternate text\"") > 0); + // scale + Assert.assertTrue(content.indexOf("alt=\"tab alternate text\"") > 0); + Assert.assertTrue(content.indexOf("width=\"49%\" height=\"49%\"") > 0); + } +} Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/test/resources/bugs/testImages21.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testImages21.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testImages21.rst 2011-03-07 16:23:50 UTC (rev 549) @@ -0,0 +1,20 @@ +Test attribut image +=================== + +.. image:: picture.jpeg + :height: 100px + :width: 200 px + :scale: 50 % + :alt: alternate text + :align: center + +.. image:: picturetab.jpeg + :height: 100px + :width: 200 px + :scale: 50 % + :alt: tab alternate text + :align: center + +.. image:: picturescale.jpeg + :scale: 49% + :alt: scale alternate text

1 0

r548 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by echatellier＠users.nuiton.org 04 Mar '11

04 Mar '11

Author: echatellier Date: 2011-03-04 13:37:01 +0100 (Fri, 04 Mar 2011) New Revision: 548 Url: http://nuiton.org/repositories/revision/jrst/548 Log: #1380 : Can't use ' character in link (patch provided by Arnaud LIAGRE) Added: trunk/jrst/src/test/resources/bugs/testLinks1380.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-03-04 09:40:37 UTC (rev 547) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-03-04 12:37:01 UTC (rev 548) @@ -2263,9 +2263,8 @@ String txtDebut = text.substring(0, matcher.start()); String txtFin = text.substring(matcher.end(), text.length()); String ref = text.substring(matcher.start(), matcher.end() - 1); - - ref = ref.replaceAll("('|_)", ""); ref = StringEscapeUtils.unescapeXml(ref); + ref = ref.replaceAll("('|_)", ""); ref = ref.replaceAll("`", ""); Element hyper = DocumentHelper.createElement("reference"); hyper.addAttribute("name", ref); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-04 09:40:37 UTC (rev 547) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-04 12:37:01 UTC (rev 548) @@ -65,6 +65,25 @@ } /** + * Test que les caracteres speciaux dans les label des liens + * ne sont pas perdus. + * + * @throws Exception + */ + @Test + public void testLinksSpecialCharacters() throws Exception { + File in = new File("src/test/resources/bugs/testLinks1380.rst"); + File out = File.createTempFile("jrst-testLinks", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + System.out.println(content); + Assert.assertTrue(content.indexOf("nuiton's forge") > 0); + Assert.assertTrue(content.indexOf("build.xml") > 0); + } + + /** * Test que la presence de caractere "tabulation" ne cause * pas d'exception lors de la generation. * Added: trunk/jrst/src/test/resources/bugs/testLinks1380.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testLinks1380.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testLinks1380.rst 2011-03-04 12:37:01 UTC (rev 548) @@ -0,0 +1,7 @@ +More info on the project on `nuiton's forge`_ . + +.. _nuiton's forge: http://www.nuiton.org/projects/show/eugene + +A sample build.xml file is available here : build.xml_. + +.. _build.xml: build.xml

1 0

r547 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by echatellier＠users.nuiton.org 04 Mar '11

04 Mar '11

Author: echatellier Date: 2011-03-04 10:40:37 +0100 (Fri, 04 Mar 2011) New Revision: 547 Url: http://nuiton.org/repositories/revision/jrst/547 Log: Fix #1378 : Tab causes nullPointerException (patch provided by Arnaud LIAGRE) Added: trunk/jrst/src/test/resources/bugs/testTab1378.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-03-01 16:19:20 UTC (rev 546) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-03-04 09:40:37 UTC (rev 547) @@ -541,7 +541,7 @@ InputStream stream = url.openStream(); source = new InputSource(stream); } - + return source; } }); @@ -552,11 +552,9 @@ e.printStackTrace(); return null; } catch (ParserConfigurationException e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } catch (SAXException e) { - // TODO Auto-generated catch block e.printStackTrace(); return null; } Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-01 16:19:20 UTC (rev 546) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-03-04 09:40:37 UTC (rev 547) @@ -25,6 +25,8 @@ package org.nuiton.jrst; +import static org.nuiton.jrst.ReStructuredText.BLOCK_QUOTE; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.dom4j.DocumentHelper; @@ -135,8 +137,6 @@ public static final String LINE = "line"; - public static final String BLOCK_QUOTE = "block_quote"; - public static final String ATTRIBUTION = "attribution"; public static final String DOCTEST_BLOCK = "doctest_block"; @@ -943,12 +943,14 @@ Element result = null; String line = in.readLine(); if (line != null) { - if (line.matches("\\s*")) { + if (line.matches("\\s.*")) { + String savedLine = line; line = in.readLine(); + if (line != null) { int level = level(line); String blockQuote = null; - if (!(level == 0)) { + if (level != 0) { String txt = line; String[] lines = in.readWhile("(^ {" + level + "}.*)|(\\s*)"); @@ -966,7 +968,7 @@ if (blockQuote != null) { result.addAttribute(ATTRIBUTION, blockQuote); } - result.setText(txt); + result.setText(savedLine + txt); } } } @@ -2360,7 +2362,8 @@ */ private int level(String line) { int result = 0; - while (line.length() > result && line.charAt(result) == ' ') { + String sTmp = line.replaceAll("\\s", " "); + while (sTmp.length() > result && sTmp.charAt(result) == ' ') { result++; } return result; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-01 16:19:20 UTC (rev 546) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-04 09:40:37 UTC (rev 547) @@ -26,6 +26,8 @@ package org.nuiton.jrst.bugs; import java.io.File; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import junit.framework.Assert; @@ -52,14 +54,32 @@ @Test public void testLinksParameters() throws Exception { File in = new File("src/test/resources/bugs/testLinks.rst"); - File out = File.createTempFile("jrst-RstToHtml2", ".html"); + File out = File.createTempFile("jrst-testLinks", ".html"); out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); - System.out.println(content); Assert.assertTrue(content.indexOf("href=\"http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=…"") > 0); Assert.assertTrue(content.indexOf("href=\"http://www.docbook.org/\"") > 0); Assert.assertTrue(content.indexOf("href=\"http://www.docbook2.org/\"") > 0); } + + /** + * Test que la presence de caractere "tabulation" ne cause + * pas d'exception lors de la generation. + * + * @throws Exception + */ + @Test + public void testTabCharacter() throws Exception { + File in = new File("src/test/resources/bugs/testTab1378.rst"); + File out = File.createTempFile("jrst-testTab1378", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + Pattern pattern = Pattern.compile(".*<blockquote>.*du bla bla \u00E9l\u00E9mentaire.*</blockquote>.*", Pattern.DOTALL); + Matcher matcher = pattern.matcher(content); + Assert.assertTrue(matcher.find()); + } } Added: trunk/jrst/src/test/resources/bugs/testTab1378.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testTab1378.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testTab1378.rst 2011-03-04 09:40:37 UTC (rev 547) @@ -0,0 +1,21 @@ +=================== +titre élémentaire 1 +=================== + +Sous-titre élémentaire 2 +------------------------ + + du bla bla élémentaire + +The easiest way to start is to use RESThub archetypes to create your first RESThub based application. Just open a command line terminal, and type : + +.. code-block:: bash + + mvn org.apache.maven.plugins:maven-archetype-plugin:2.0:generate -DarchetypeCatalog=http://resthub.org/nexus/content/repositories/releases/ + +You will have to choose between 3 RESThub archetypes : + + * **resthub-js-webapp-archetype** : simple HTML5/Javascript web application + * **resthub-tapestry5-webapp-archetype** : simple RESThub based Tapestry 5 web application + * **resthub-middle-archetype** : a JAR module for inclusion in your multi modules project + \ No newline at end of file

1 0

r546 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs test/resources/bugs
by echatellier＠users.nuiton.org 01 Mar '11

01 Mar '11

Author: echatellier Date: 2011-03-01 17:19:20 +0100 (Tue, 01 Mar 2011) New Revision: 546 Url: http://nuiton.org/repositories/revision/jrst/546 Log: Apply Arnaud LIAGRE's patch for #675 Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/resources/bugs/testLinks.rst Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-02-28 09:52:05 UTC (rev 545) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-03-01 16:19:20 UTC (rev 546) @@ -2092,8 +2092,8 @@ int start = matcher.start(); int end = matcher.end(); Element ref = DocumentHelper.createElement(REFERENCE); - ref.addAttribute("refuri", matcher.group(2)); - ref.setText(matcher.group(1)); + ref.addAttribute("refuri", StringEscapeUtils.unescapeXml(matcher.group(2))); + ref.setText(StringEscapeUtils.unescapeXml(matcher.group(1))); String key = "inlineReference" + index++; temporaries.put(key, ref.asXML()); text = text.substring(0, start) + "<tmp>" + key + "</tmp>" Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2011-02-28 09:52:05 UTC (rev 545) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java 2011-03-01 16:19:20 UTC (rev 546) @@ -205,7 +205,7 @@ public static final Pattern REGEX_REFERENCE = Pattern .compile("(https?://[-/%#[\\&&&[^(>)]]\\._\\w:]+\\w+)((\\W|&|$)+)"); public static final Pattern REGEX_INLINE_REFERENCE = Pattern - .compile("`(.+) \\&lt\\;(https?://[-/%#&\\._\\w:]+)(\\&gt\\;)`_"); + .compile("`(.+?) \\&lt\\;(https?://[-/%#&\\._\\w:[^ ]]+)(\\&gt\\;)`_"); public static final Pattern REGEX_EMAIL = Pattern .compile("(^|[^_\\w])([-\\._\\w]+(a)[-\\._\\w]+)([^-\\._\\w]|$)"); public static final Pattern REGEX_FOOTNOTE_REFERENCE = Pattern Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-03-01 16:19:20 UTC (rev 546) @@ -0,0 +1,65 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.jrst.bugs; + +import java.io.File; + +import junit.framework.Assert; + +import org.apache.commons.io.FileUtils; +import org.junit.Test; +import org.nuiton.jrst.JRST; + +/** + * Test sur les elements de type text (liens, styles...) + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TextTest { + + /** + * Test que les liens avec parametres sont correctement parsés. + * + * @throws Exception + */ + @Test + public void testLinksParameters() throws Exception { + File in = new File("src/test/resources/bugs/testLinks.rst"); + File out = File.createTempFile("jrst-RstToHtml2", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + + String content = FileUtils.readFileToString(out); + System.out.println(content); + Assert.assertTrue(content.indexOf("href=\"http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=…"") > 0); + Assert.assertTrue(content.indexOf("href=\"http://www.docbook.org/\"") > 0); + Assert.assertTrue(content.indexOf("href=\"http://www.docbook2.org/\"") > 0); + } +} Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/test/resources/bugs/testLinks.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testLinks.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testLinks.rst 2011-03-01 16:19:20 UTC (rev 546) @@ -0,0 +1,11 @@ +Test html links +=============== + + * `Report de bugs <http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=browse>`_ + : Il sert à la notification d'un problème lors de l'utilisation d'ISIS-Fish. + * `Demande d'amélioration <http://labs.libre-entreprise.org/tracker/?atid=116&group_id=8&func=browse>`_ + : Il sert à ajouter des idées d'amélioration ISIS-Fish. + * `Report de problèmes de traduction <http://labs.libre-entreprise.org/tracker/?atid=438&group_id=8&func=browse>`_ + : Il sert pour reporter les erreurs de traduction. + +`DocBook <http://www.docbook.org/>`_ bla bla `DocBook2 <http://www.docbook2.org/>`_

1 0

r545 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 28 Feb '11

28 Feb '11

Author: echatellier Date: 2011-02-28 10:52:05 +0100 (Mon, 28 Feb 2011) New Revision: 545 Url: http://nuiton.org/repositories/revision/jrst/545 Log: Enable test about pdf generation Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-02-28 09:28:10 UTC (rev 544) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java 2011-02-28 09:52:05 UTC (rev 545) @@ -222,28 +222,6 @@ Transformer transformer = factory.newTransformer(new StreamSource( stylesheet.openStream())); - // DEBUG To see where is the probleme with the dtd locator :( - // transformer.setErrorListener(new ErrorListener() { - // public void error(TransformerException exception) throws - // TransformerException { - // exception.printStackTrace(); - // } - // public void fatalError(TransformerException exception) throws - // TransformerException { - // exception.printStackTrace(); - // } - // public void warning(TransformerException exception) throws - // TransformerException { - // exception.printStackTrace(); - // } - // - // }); - - // TODO - // for (int i=0; i<args.length; i+=2) { - // transformer. - // } - // now lets style the given document DocumentSource source = new DocumentSource(doc); DocumentResult result = new DocumentResult(); @@ -251,6 +229,7 @@ // return the transformed document Document transformedDoc = result.getDocument(); + return transformedDoc; } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2011-02-28 09:28:10 UTC (rev 544) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java 2011-02-28 09:52:05 UTC (rev 545) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -69,6 +70,7 @@ File test1 = File.createTempFile("jrst-RstToHtml2", ".html"); JRST.main(new String[] { "-t", "html", "--force", "-o", test1.getAbsolutePath(), "src/test/resources/text.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -82,6 +84,7 @@ File test1 = File.createTempFile("jrst-RstToDocbook", ".dbk"); JRST.main(new String[]{"-t", "docbook", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test.rst"}); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -95,6 +98,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -113,6 +117,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc2", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test2.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -126,6 +131,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc3", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test3.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -139,6 +145,7 @@ File test1 = File.createTempFile("jrst-RstToXdoc4", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test4.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } @@ -152,10 +159,11 @@ File test1 = File.createTempFile("jrst-RstToXdocJrstSite", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/frEntier.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } - @Ignore + @Test public void testRstToPDF() throws Exception { if (log.isInfoEnabled()) { @@ -164,7 +172,8 @@ File test1 = File.createTempFile("jrst-RstToPDF", ".pdf"); JRST.main(new String[] { "-t", "pdf", "--force","-o", test1.getAbsolutePath(), - "src/test/resources/frEntier.rst" }); + "src/test/resources/test.rst" }); + Assert.assertTrue(test1.length() > 0); test1.delete(); } }

1 0

r544 - trunk/jrst/src/main/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 28 Feb '11

28 Feb '11

Author: echatellier Date: 2011-02-28 10:28:10 +0100 (Mon, 28 Feb 2011) New Revision: 544 Url: http://nuiton.org/repositories/revision/jrst/544 Log: Replace sysout by log.debug Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-28 09:18:03 UTC (rev 543) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-28 09:28:10 UTC (rev 544) @@ -153,7 +153,7 @@ /** ODT output format type */ public static final String TYPE_ODT = "odt"; - + /** FO output format type */ public static final String TYPE_FO = "fo"; @@ -534,9 +534,13 @@ String smallSystemId = systemId.substring(systemId.lastIndexOf("/") + 1); URL url = Resource.getURL("/docbook/common/" + smallSystemId); - System.out.println("Url found = " + url); - InputStream stream = url.openStream(); - source = new InputSource(stream); + if (url != null) { + if (log.isDebugEnabled()) { + log.debug("Resolved entity url : " + url); + } + InputStream stream = url.openStream(); + source = new InputSource(stream); + } return source; }

1 0

r543 - trunk/maven-jrst-plugin
by echatellier＠users.nuiton.org 28 Feb '11

28 Feb '11

Author: echatellier Date: 2011-02-28 10:18:03 +0100 (Mon, 28 Feb 2011) New Revision: 543 Url: http://nuiton.org/repositories/revision/jrst/543 Log: Update version Modified: trunk/maven-jrst-plugin/pom.xml Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2011-02-26 10:22:57 UTC (rev 542) +++ trunk/maven-jrst-plugin/pom.xml 2011-02-28 09:18:03 UTC (rev 543) @@ -37,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId>

1 0

r542 - in trunk/jrst: . src/main/assembly
by tchemit＠users.nuiton.org 26 Feb '11

26 Feb '11

Author: tchemit Date: 2011-02-26 11:22:57 +0100 (Sat, 26 Feb 2011) New Revision: 542 Url: http://nuiton.org/repositories/revision/jrst/542 Log: improve assembly-profile + reformat assembly descriptors Modified: trunk/jrst/pom.xml trunk/jrst/src/main/assembly/deps.xml trunk/jrst/src/main/assembly/full.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-02-17 10:34:11 UTC (rev 541) +++ trunk/jrst/pom.xml 2011-02-26 10:22:57 UTC (rev 542) @@ -261,6 +261,9 @@ </property> </activation> <build> + + <defaultGoal>verify</defaultGoal> + <plugins>  Modified: trunk/jrst/src/main/assembly/deps.xml =================================================================== --- trunk/jrst/src/main/assembly/deps.xml 2011-02-17 10:34:11 UTC (rev 541) +++ trunk/jrst/src/main/assembly/deps.xml 2011-02-26 10:22:57 UTC (rev 542) @@ -23,57 +23,57 @@ #L% --> <assembly> - <id>deps</id> - <formats> - <format>zip</format> - </formats> -  - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <excludes> - <exclude>junit:junit</exclude> - <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-sources.jar</exclude> - <exclude>*-javadoc.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <includes> - <include>README*</include> - <include>LICENSE*</include> - <include>pom.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/assembly</directory> - <outputDirectory /> - <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>jrst.bat</include> - <include>jrst.sh</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>target/classes</directory> - <includes> - <include>THIRD-PARTY.txt</include> - </includes> - </fileSet> - </fileSets> + <id>deps</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>junit:junit</exclude> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + <exclude>*-javadoc.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>jrst.bat</include> + <include>jrst.sh</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + </fileSets> </assembly> \ No newline at end of file Modified: trunk/jrst/src/main/assembly/full.xml =================================================================== --- trunk/jrst/src/main/assembly/full.xml 2011-02-17 10:34:11 UTC (rev 541) +++ trunk/jrst/src/main/assembly/full.xml 2011-02-26 10:22:57 UTC (rev 542) @@ -23,59 +23,59 @@ #L% --> <assembly> - <id>full</id> - <formats> - <format>zip</format> - </formats> -  - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <excludes> - <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> - </excludes> - <scope>runtime</scope> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>target</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - <excludes> - <exclude>*-sources.jar</exclude> - </excludes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <includes> - <include>README*</include> - <include>LICENSE*</include> - <include>pom.xml</include> - </includes> - </fileSet> - <fileSet> - <outputDirectory>/</outputDirectory> - <directory>target/classes</directory> - <includes> - <include>THIRD-PARTY.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/assembly</directory> - <outputDirectory /> - <filtered>true</filtered> - <fileMode>0755</fileMode> - <includes> - <include>jrst.bat</include> - <include>jrst.sh</include> - </includes> - </fileSet> - <fileSet> - <directory>src</directory> -  - </fileSet> - </fileSets> + <id>full</id> + <formats> + <format>zip</format> + </formats> +  + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <excludes> + <exclude>${artifact.groupId}:${artifact.artifactId}</exclude> + </excludes> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>target</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>pom.xml</include> + </includes> + </fileSet> + <fileSet> + <outputDirectory>/</outputDirectory> + <directory>target/classes</directory> + <includes> + <include>THIRD-PARTY.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>jrst.bat</include> + <include>jrst.sh</include> + </includes> + </fileSet> + <fileSet> + <directory>src</directory> +  + </fileSet> + </fileSets> </assembly> \ No newline at end of file

1 0

r541 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 17 Feb '11

17 Feb '11

Author: echatellier Date: 2011-02-17 11:34:11 +0100 (Thu, 17 Feb 2011) New Revision: 541 Url: http://nuiton.org/repositories/revision/jrst/541 Log: Test resources in classpath Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-16 21:14:16 UTC (rev 540) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-02-17 10:34:11 UTC (rev 541) @@ -116,11 +116,11 @@ protected static final String rst2docbook = "/xsl/dn2dbk.xsl"; /** XSL Stylesheet to transform Docbook into xHTML. */ - protected static final String docbook2xhtml = "/xhtml/docbook.xsl"; + protected static final String docbook2xhtml = "/docbook/xhtml/docbook.xsl"; /** XSL Stylesheet to transform Docbook into javahelp. */ - protected static final String docbook2javahelp = "/javahelp/javahelp.xsl"; + protected static final String docbook2javahelp = "/docbook/javahelp/javahelp.xsl"; /** XSL Stylesheet to transform Docbook into htmlhelp. */ - protected static final String docbook2htmlhelp = "/htmlhelp/htmlhelp.xsl"; + protected static final String docbook2htmlhelp = "/docbook/htmlhelp/htmlhelp.xsl"; // /** XSL Stylesheet to transform xml into rst. */ // protected static final String rst2rst = "JRSTWriter"; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2011-02-16 21:14:16 UTC (rev 540) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java 2011-02-17 10:34:11 UTC (rev 541) @@ -28,12 +28,14 @@ import java.io.File; import java.util.Arrays; import java.util.List; + 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.util.Resource; /** * @@ -43,7 +45,9 @@ /** to use log facility, just put in your code: log.info("..."); */ protected static Log log = LogFactory.getLog(JRSTTest.class); + static File basedir; + static File testBasedir; @BeforeClass @@ -62,7 +66,25 @@ log.info("test basedir : " + testBasedir); } + /** + * Test que les ressources sont bien dans le classpath. + * + * Test du cas particulier de la dependance docbook-xsl. + */ @Test + public void testResources() { + Assert.assertNotNull(Resource.getURL(JRST.rst2xhtml)); + Assert.assertNotNull(Resource.getURL(JRST.rst2xdoc)); + Assert.assertNotNull(Resource.getURL(JRST.rst2docbook)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2xhtml)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2javahelp)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2htmlhelp)); + // FIXME echatellier 20110217 following assert fails + //Assert.assertNotNull(Resource.getURL(JRST.docbook2odf)); + Assert.assertNotNull(Resource.getURL(JRST.docbook2fo)); + } + + @Test public void generateRst() throws Exception { File in = new File(testBasedir, "toRst1-in.rst");

1 0

r540 - trunk
by tchemit＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:14:16 +0100 (Wed, 16 Feb 2011) New Revision: 540 Url: http://nuiton.org/repositories/revision/jrst/540 Log: Update mavenpom4redmineAndCentral to 2.5.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-11 16:18:45 UTC (rev 539) +++ trunk/pom.xml 2011-02-16 21:14:16 UTC (rev 540) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <artifactId>jrst</artifactId>

1 0