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

r609 - trunk/jrst/src/main/java/org/nuiton/jrst
by sletellier＠users.nuiton.org Aug. 18, 2011

Aug. 18, 2011

Author: sletellier Date: 2011-08-18 14:11:06 +0200 (Thu, 18 Aug 2011) New Revision: 609 Url: http://nuiton.org/repositories/revision/jrst/609 Log: Retrieve outputEncoding param for generate method 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-08-18 09:25:35 UTC (rev 608) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java 2011-08-18 12:11:06 UTC (rev 609) @@ -284,7 +284,12 @@ public static void generate(String xslListOrOutType, File fileIn, File fileOut, Overwrite overwrite) throws Exception { + generate(xslListOrOutType, fileIn, fileOut, UTF_8, overwrite); + } + public static void generate(String xslListOrOutType, File fileIn, + File fileOut, String outputEncoding, Overwrite overwrite) throws Exception { + if (fileOut != null && fileOut.exists() && (overwrite == Overwrite.NEVER || (overwrite == Overwrite.IFNEWER && FileUtil @@ -295,7 +300,7 @@ + ", because already exists"); } else { URL url = fileIn.toURI().toURL(); - Reader reader = new InputStreamReader(url.openStream(), UTF_8); + Reader reader = new InputStreamReader(url.openStream(), outputEncoding); FileWriter writer = new FileWriter(fileOut); String result = generateString(xslListOrOutType, reader);

1 0

r608 - in trunk: . doxia-module-jrst doxia-module-jrst/src/license doxia-module-jrst/src/main/java/org/nuiton/jrst doxia-module-jrst/src/site doxia-module-jrst/src/site/apt doxia-module-jrst/src/site/en/apt doxia-module-jrst/src/test/java/org/nuiton/jrst doxia-module-jrst/src/test/resources jrst jrst/src/license jrst/src/main/assembly jrst/src/main/java/org/nuiton/jrst jrst/src/main/java/org/nuiton/jrst/convertisor jrst/src/main/resources jrst/src/main/resources/i18n jrst/src/site/apt jrst/sr
by tchemit＠users.nuiton.org Aug. 18, 2011

Aug. 18, 2011

Author: tchemit Date: 2011-08-18 11:25:35 +0200 (Thu, 18 Aug 2011) New Revision: 608 Url: http://nuiton.org/repositories/revision/jrst/608 Log: add headers + svn properties Modified: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/doxia-module-jrst/LICENSE.txt trunk/doxia-module-jrst/README.txt trunk/doxia-module-jrst/changelog.txt trunk/doxia-module-jrst/pom.xml trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java trunk/doxia-module-jrst/src/site/apt/devel.apt trunk/doxia-module-jrst/src/site/apt/index.apt trunk/doxia-module-jrst/src/site/en/apt/devel.apt trunk/doxia-module-jrst/src/site/en/apt/index.apt trunk/doxia-module-jrst/src/site/site_en.xml trunk/doxia-module-jrst/src/site/site_fr.xml trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java trunk/doxia-module-jrst/src/test/resources/test.rst trunk/jrst-doc/LICENSE.txt trunk/jrst-doc/README.txt trunk/jrst-doc/src/site/resources/en-redirect.html trunk/jrst-doc/src/site/resources/fr-redirect.html trunk/jrst-doc/src/site/rst/user/faq.rst trunk/jrst/LICENSE.txt trunk/jrst/README.txt trunk/jrst/src/license/THIRD-PARTY.properties trunk/jrst/src/main/assembly/deps.xml trunk/jrst/src/main/assembly/full.xml trunk/jrst/src/main/assembly/jrst.bat trunk/jrst/src/main/assembly/jrst.sh trunk/jrst/src/main/java/org/nuiton/jrst/JRSTConfig.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTConfigAction.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTConfigOption.java trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties trunk/jrst/src/main/resources/log4j.properties trunk/jrst/src/site/apt/index.apt trunk/jrst/src/site/en/apt/index.apt trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java trunk/jrst/src/test/resources/FilesTest/index.txt trunk/jrst/src/test/resources/FilesTest/roles.txt trunk/jrst/src/test/resources/FilesTest/rstTest.rst trunk/jrst/src/test/resources/bugs/infiniteLoop.rst trunk/jrst/src/test/resources/bugs/testContent877.rst trunk/jrst/src/test/resources/bugs/testImages21.rst trunk/jrst/src/test/resources/bugs/testLinks.rst trunk/jrst/src/test/resources/bugs/testLinks1380.rst trunk/jrst/src/test/resources/bugs/testNoContentSubtitles.rst trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst trunk/jrst/src/test/resources/bugs/testOptionsList644.rst trunk/jrst/src/test/resources/bugs/testTab1378.rst trunk/jrst/src/test/resources/bugs/testTable1290.rst trunk/jrst/src/test/resources/bugs/testTable1375.rst trunk/jrst/src/test/resources/testAnonymous.rst trunk/jrst/src/test/resources/testEmptyTableContents.rst trunk/jrst/src/test/resources/testExternalLink.rst trunk/jrst/src/test/resources/testFootnote.rst trunk/jrst/src/test/resources/testHyperlinkTarget.rst trunk/jrst/src/test/resources/testHyperlinkTarget.xml trunk/jrst/src/test/resources/testLiteral.rst trunk/maven-jrst-plugin/LICENSE.txt trunk/maven-jrst-plugin/README.txt trunk/maven-jrst-plugin/changelog.txt trunk/maven-jrst-plugin/src/main/resources/log4j.properties trunk/maven-jrst-plugin/src/site/apt/index.apt trunk/maven-jrst-plugin/src/site/en/apt/index.apt trunk/maven-jrst-plugin/src/site/site_en.xml trunk/pom.xml trunk/src/license/project.xml trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/site/apt/devel.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/site/en/apt/devel.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/site/site_en.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/doxia-module-jrst/src/test/resources/test.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/assembly/deps.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/assembly/full.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/assembly/jrst.bat ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/assembly/jrst.sh ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTConfig.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTConfigAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTConfigOption.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties 2011-08-18 09:25:35 UTC (rev 608) @@ -6,7 +6,7 @@ jrst.option.force=Remplace un fichier existant jrst.option.outfile=Fichier de sortie jrst.option.outtype=Type de sortie (xml|xhtml|docbook|html|xdoc|rst|fo|pdf) -jrst.option.xslfile=Fichier XSL a appliquer (s\u00E9par\u00E9 par une ,) +jrst.option.xslfile=Fichier XSL a appliquer (séparé par une ,) open=Ouvrir le fichier \: openEmpty?=Ce champ doit etre rempli. overwriteGraph?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ? Property changes on: trunk/jrst/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-08-18 09:25:35 UTC (rev 608) @@ -1,3 +1,27 @@ +/* + * #%L + * JRst :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * 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; import junit.framework.Assert; Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/jrst/src/test/resources/FilesTest/index.txt =================================================================== --- trunk/jrst/src/test/resources/FilesTest/index.txt 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/test/resources/FilesTest/index.txt 2011-08-18 09:25:35 UTC (rev 608) @@ -4,8 +4,8 @@ :Author: David Goodger :Contact: goodger(a)python.org -:Date: $Date: 2008-12-26 17:36:46 -0500 (Fri, 26 Dec 2008) $ -:Revision: $Revision: 5834 $ +:Date: $Date$ +:Revision: $Revision$ :Copyright: This document has been placed in the public domain. The latest working documents may be accessed individually below, or Property changes on: trunk/jrst/src/test/resources/FilesTest/index.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jrst/src/test/resources/FilesTest/roles.txt =================================================================== --- trunk/jrst/src/test/resources/FilesTest/roles.txt 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/test/resources/FilesTest/roles.txt 2011-08-18 09:25:35 UTC (rev 608) @@ -4,8 +4,8 @@ :Author: David Goodger :Contact: goodger(a)python.org -:Revision: $Revision: 4564 $ -:Date: $Date: 2006-05-21 16:44:42 -0400 (Sun, 21 May 2006) $ +:Revision: $Revision$ +:Date: $Date$ :Copyright: This document has been placed in the public domain. This document describes the interpreted text roles implemented in the Property changes on: trunk/jrst/src/test/resources/FilesTest/roles.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jrst/src/test/resources/FilesTest/rstTest.rst =================================================================== --- trunk/jrst/src/test/resources/FilesTest/rstTest.rst 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/test/resources/FilesTest/rstTest.rst 2011-08-18 09:25:35 UTC (rev 608) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin +.. * %% +.. * 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% +.. - ===== tests ===== Property changes on: trunk/jrst/src/test/resources/FilesTest/rstTest.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/infiniteLoop.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testContent877.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testImages21.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testLinks.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testLinks1380.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testNoContentSubtitles.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testOptionsList644.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testTab1378.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/bugs/testTable1290.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/bugs/testTable1375.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/jrst/src/test/resources/testAnonymous.rst =================================================================== --- trunk/jrst/src/test/resources/testAnonymous.rst 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/test/resources/testAnonymous.rst 2011-08-18 09:25:35 UTC (rev 608) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin +.. * %% +.. * 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% +.. - There are three types of hyperlink targets: internal, external, and indirect. Property changes on: trunk/jrst/src/test/resources/testAnonymous.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/testEmptyTableContents.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/testExternalLink.rst ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/jrst/src/test/resources/testFootnote.rst =================================================================== --- trunk/jrst/src/test/resources/testFootnote.rst 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/test/resources/testFootnote.rst 2011-08-18 09:25:35 UTC (rev 608) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin +.. * %% +.. * 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% +.. - test [1]_ .. [1] There are ``*-wide.txt`` variants for each of these character. Property changes on: trunk/jrst/src/test/resources/testFootnote.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/testHyperlinkTarget.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst/src/test/resources/testHyperlinkTarget.xml ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/jrst/src/test/resources/testLiteral.rst =================================================================== --- trunk/jrst/src/test/resources/testLiteral.rst 2011-08-18 09:22:31 UTC (rev 607) +++ trunk/jrst/src/test/resources/testLiteral.rst 2011-08-18 09:25:35 UTC (rev 608) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2011 CodeLutin +.. * %% +.. * 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% +.. - 1. Déployer le war de l'application dans le serveur d'application. Pour Tomcat 6, placer le war ou un lien symbolique vers celui-ci dans le répertoire webapps. Property changes on: trunk/jrst/src/test/resources/testLiteral.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/jrst-doc/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst-doc/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst-doc/src/site/resources/en-redirect.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst-doc/src/site/resources/fr-redirect.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/jrst-doc/src/site/rst/user/faq.rst ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-jrst-plugin/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-jrst-plugin/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-jrst-plugin/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-jrst-plugin/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-jrst-plugin/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-jrst-plugin/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-jrst-plugin/src/site/site_en.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native

1 0

r607 - trunk
by tchemit＠users.nuiton.org Aug. 18, 2011

Aug. 18, 2011

Author: tchemit Date: 2011-08-18 11:22:31 +0200 (Thu, 18 Aug 2011) New Revision: 607 Url: http://nuiton.org/repositories/revision/jrst/607 Log: reformat pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 05:20:37 UTC (rev 606) +++ trunk/pom.xml 2011-08-18 09:22:31 UTC (rev 607) @@ -23,7 +23,9 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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> @@ -207,9 +209,9 @@ </dependency> <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> - <version>9.1.0.8</version> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>9.1.0.8</version> </dependency> <dependency>

1 0

r606 - in trunk: . doxia-module-jrst/src/license jrst/src/license maven-jrst-plugin/src/license
by tchemit＠users.nuiton.org Aug. 18, 2011

Aug. 18, 2011

Author: tchemit Date: 2011-08-18 07:20:37 +0200 (Thu, 18 Aug 2011) New Revision: 606 Url: http://nuiton.org/repositories/revision/jrst/606 Log: Evolution #1677: Updates to i18n 2.4.1 and nuiton-utils 2.2 update third parties Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties trunk/jrst/src/license/THIRD-PARTY.properties trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2011-08-16 23:11:41 UTC (rev 605) +++ trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2011-08-18 05:20:37 UTC (rev 606) @@ -3,9 +3,13 @@ # Already used licenses in project : # - Apache License # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - LGPL +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Mozilla Public License Version 1.0 # - Mozilla Public License version 1.1 # - The Apache Software License, Version 2.0 @@ -16,12 +20,12 @@ # Please fill the missing licenses for dependencies : # # -#Thu Apr 28 11:16:41 CEST 2011 -com.ibm.icu--icu4j--2.6.1--jar=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=BSD -jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-classworlds--1.2-alpha-9--jar=http\://classworlds.codehaus.org/license.html -org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl--jar=Lesser General Public License (LGPL) v 3.0 -xerces--xercesImpl--2.6.2--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 07:17:51 CEST 2011 +com.ibm.icu--icu4j--2.6.1=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-classworlds--1.2-alpha-9=http\://classworlds.codehaus.org/license.html +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 +xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 Modified: trunk/jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jrst/src/license/THIRD-PARTY.properties 2011-08-16 23:11:41 UTC (rev 605) +++ trunk/jrst/src/license/THIRD-PARTY.properties 2011-08-18 05:20:37 UTC (rev 606) @@ -2,9 +2,14 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - LGPL +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MIT/X Consortium License # - Mozilla Public License Version 1.0 # - Mozilla Public License version 1.1 # - The Apache Software License, Version 2.0 @@ -14,12 +19,12 @@ # Please fill the missing licenses for dependencies : # # -#Thu Apr 28 11:13:46 CEST 2011 -com.ibm.icu--icu4j--2.6.1--jar=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=BSD -jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 -net.sf.docbook--docbook-xsl--1.76.1--zip--resources=MIT/X Consortium License -org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl--jar=Lesser General Public License (LGPL) v 3.0 -xerces--xercesImpl--2.6.2--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 07:17:49 CEST 2011 +com.ibm.icu--icu4j--2.6.1=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +net.sf.docbook--docbook-xsl--1.76.1=MIT/X Consortium License +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 +xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 Modified: trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties 2011-08-16 23:11:41 UTC (rev 605) +++ trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties 2011-08-18 05:20:37 UTC (rev 606) @@ -1,30 +1,34 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License 2.0 # - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - LGPL +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Mozilla Public License Version 1.0 # - Mozilla Public License version 1.1 # - Public Domain # - The Apache Software License, Version 2.0 +# - X License (http://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.h…) +# - http://classworlds.codehaus.org/license.html +# - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Nov 22 16:43:24 CET 2010 -oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 -com.ibm.icu--icu4j--2.6.1--jar=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) -commons-codec--commons-codec--1.2--jar=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=BSD -jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 -net.sf.docbook--docbook-xsl--1.75.2--zip--resources=Docbook license (MIT-like) -org.codehaus.plexus--plexus-classworlds--1.2-alpha-9--jar=http\://classworlds.codehaus.org/license.html -org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl--jar=Lesser General Public License (LGPL) v 3.0 -xerces--xercesImpl--2.6.2--jar=The Apache Software License, Version 2.0 - -classworlds--classworlds--1.1-alpha-2--jar=http\://classworlds.codehaus.org/license.html -org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1--jar=The Apache Software License, Version 2.0 \ No newline at end of file +#Thu Aug 18 07:17:52 CEST 2011 +classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +com.ibm.icu--icu4j--2.6.1=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-classworlds--1.2-alpha-9=http\://classworlds.codehaus.org/license.html +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 +xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-16 23:11:41 UTC (rev 605) +++ trunk/pom.xml 2011-08-18 05:20:37 UTC (rev 606) @@ -376,8 +376,8 @@ <siteSourcesType>apt</siteSourcesType> <doxiaVersion>1.1.4</doxiaVersion> - <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> - <nuitonI18nVersion>2.3.2</nuitonI18nVersion> + <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> </properties>

1 0

r605 - trunk
by tchemit＠users.nuiton.org Aug. 16, 2011

Aug. 16, 2011

Author: tchemit Date: 2011-08-17 01:11:41 +0200 (Wed, 17 Aug 2011) New Revision: 605 Url: http://nuiton.org/repositories/revision/jrst/605 Log: Update mavenpom4redmineAndCentral to 3.0.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 09:51:08 UTC (rev 604) +++ trunk/pom.xml 2011-08-16 23:11:41 UTC (rev 605) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0</version> + <version>3.0.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r604 - trunk
by tchemit＠users.nuiton.org Aug. 4, 2011

Aug. 4, 2011

Author: tchemit Date: 2011-08-04 11:51:08 +0200 (Thu, 04 Aug 2011) New Revision: 604 Url: http://nuiton.org/repositories/revision/jrst/604 Log: Update mavenpom4redmineAndCentral to 3.0. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-10 07:51:04 UTC (rev 603) +++ trunk/pom.xml 2011-08-04 09:51:08 UTC (rev 604) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.5</version> + <version>3.0</version> </parent> <artifactId>jrst</artifactId>

1 0

r603 - in trunk/jrst/src/test: java/org/nuiton/jrst resources
by kcardineaud＠users.nuiton.org June 10, 2011

June 10, 2011

Author: kcardineaud Date: 2011-06-10 09:51:04 +0200 (Fri, 10 Jun 2011) New Revision: 603 Url: http://nuiton.org/repositories/revision/jrst/603 Log: #1590 Verbatim block not well generated : add a test Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java trunk/jrst/src/test/resources/testLiteral.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-09 16:37:50 UTC (rev 602) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-10 07:51:04 UTC (rev 603) @@ -158,7 +158,7 @@ Assert.assertTrue(actualXml.contains(xmlexpected)); } - /* + @Test public void testLiteral() throws Exception { URL url = JRSTReaderTest.class.getResource("/testLiteral.rst"); @@ -170,7 +170,9 @@ String xmlexpected = - "<literal_block>refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com"; + "<literal_block> refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com\n" + + "\n" + + "</literal_block></list_item></enumerated_list><paragraph>Paragraphe test</paragraph></document>"; String actualXml = doc.asXML(); @@ -178,7 +180,7 @@ log.warn("Expected :\n" + xmlexpected); Assert.assertTrue(actualXml.contains(xmlexpected)); - }*/ + } @Test Modified: trunk/jrst/src/test/resources/testLiteral.rst =================================================================== --- trunk/jrst/src/test/resources/testLiteral.rst 2011-06-09 16:37:50 UTC (rev 602) +++ trunk/jrst/src/test/resources/testLiteral.rst 2011-06-10 07:51:04 UTC (rev 603) @@ -3,4 +3,6 @@ 2. Editer la configuration de base. Créez un fichier de configuration nommé:: - refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com \ No newline at end of file + refcomp.admin.email=l'email des administrateurs. Example : admin(a)refcomp.com + +Paragraphe test \ No newline at end of file

1 0

r602 - trunk/jrst
by sletellier＠users.nuiton.org June 9, 2011

June 9, 2011

Author: sletellier Date: 2011-06-09 18:37:50 +0200 (Thu, 09 Jun 2011) New Revision: 602 Url: http://nuiton.org/repositories/revision/jrst/602 Log: Fix dependencies Modified: trunk/jrst/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-06-09 16:31:45 UTC (rev 601) +++ trunk/jrst/pom.xml 2011-06-09 16:37:50 UTC (rev 602) @@ -84,8 +84,9 @@ <artifactId>fop</artifactId> </dependency> <dependency> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <scope>runtime</scope> </dependency> <!-- <dependency> <artifactId>xalan</artifactId>

1 0

r601 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by kcardineaud＠users.nuiton.org June 9, 2011

June 9, 2011

Author: kcardineaud Date: 2011-06-09 18:31:45 +0200 (Thu, 09 Jun 2011) New Revision: 601 Url: http://nuiton.org/repositories/revision/jrst/601 Log: #1590 Verbatim block not well generated Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2011-06-09 14:25:13 UTC (rev 600) +++ trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2011-06-09 16:31:45 UTC (rev 601) @@ -192,6 +192,15 @@ } /** + * Add a character at the current position + * @param character that you want to add + */ + public void add(char character) { + buffer.add(nextChar,character); + } + + + /** * go left in reading char buffer * * @param number @@ -297,6 +306,9 @@ } } + + + /** * passe les lignes blanches * Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-06-09 14:25:13 UTC (rev 600) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-06-09 16:31:45 UTC (rev 601) @@ -281,6 +281,9 @@ * length of the last element returned (number of char need to this element) */ private int elementLength; + + + public JRSTLexer(Reader reader) { titleLevels = new ArrayList<String>(); @@ -1258,13 +1261,24 @@ boolean literal = false; if (para.endsWith(": ::")) { para = para.substring(0, para.length() - " ::".length()); + in.unread("::", true); + for(int i=0;i<level;i++) { + in.add(' '); + } + literal = true; } else if (para.endsWith("::")) { para = para.substring(0, para.length() - ":".length()); // keep // one // : + in.unread("::", true); + + for(int i=0;i<level;i++) { + in.add(' '); + } + literal = true; } @@ -1303,14 +1317,17 @@ Element result = null; // in.skipBlankLines(); - + + String[] prefix = in.readLines(2); if (prefix.length == 2 && prefix[0].matches("\\s*::\\s*") && prefix[1].matches("\\s*")) { + + int level = level(prefix[0]); String para = in.readLine(); if (para != null) { - int level = level(para); + level=level+1; para = para.substring(level) + "\n"; // it's literal block until level is down Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-09 14:25:13 UTC (rev 600) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-06-09 16:31:45 UTC (rev 601) @@ -158,7 +158,7 @@ Assert.assertTrue(actualXml.contains(xmlexpected)); } - + /* @Test public void testLiteral() throws Exception { URL url = JRSTReaderTest.class.getResource("/testLiteral.rst"); @@ -178,7 +178,7 @@ log.warn("Expected :\n" + xmlexpected); Assert.assertTrue(actualXml.contains(xmlexpected)); - } + }*/ @Test

1 0

r600 - in trunk/jrst/src/test/java/org/nuiton/jrst: . bugs
by tchemit＠users.nuiton.org June 9, 2011

June 9, 2011

Author: tchemit Date: 2011-06-09 16:25:13 +0200 (Thu, 09 Jun 2011) New Revision: 600 Url: http://nuiton.org/repositories/revision/jrst/600 Log: fix tests while using java.io.tmpdir + NEVER delete a file generated file in a test Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTCompareDocutils.java 2011-06-09 14:25:13 UTC (rev 600) @@ -1,28 +1,11 @@ package org.nuiton.jrst; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.URL; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.io.FileFilter; - -import javax.xml.transform.TransformerException; - import junit.framework.Assert; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.DifferenceListener; - import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener; import org.dom4j.Document; import org.dom4j.DocumentException; @@ -32,10 +15,24 @@ import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.util.FileUtil; +import javax.xml.transform.TransformerException; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URL; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; + public class JRSTCompareDocutils { /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -47,6 +44,12 @@ /** Commande utilisee pour transformer le rst en html */ private static String rst2html = "rst2html"; + public static void prepareTmpDir() throws IOException { + + File testFile = new File(System.getProperty("java.io.tmpdir")); + + FileUtil.createDirectoryIfNecessary(testFile); + } public static void main(String[] args) throws Exception { Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/DirectiveTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,13 +25,16 @@ package org.nuiton.jrst.bugs; -import java.io.File; - import org.apache.commons.io.FileUtils; 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 directives. * @@ -43,6 +46,11 @@ */ public class DirectiveTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que les options des directives images sont correctement * parsées. @@ -53,7 +61,7 @@ public void testImageDirectiveOption() throws Exception { File in = new File("src/test/resources/bugs/testImages21.rst"); File out = File.createTempFile("jrst-testImages", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -75,7 +83,7 @@ public void testContentDirective() throws Exception { File in = new File("src/test/resources/bugs/testContent877.rst"); File out = File.createTempFile("jrst-testContent", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -27,10 +27,13 @@ import org.dom4j.Document; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.jrst.JRSTCompareDocutils; import org.nuiton.jrst.JRSTReader; import org.nuiton.jrst.JRSTReaderTest; +import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; @@ -46,6 +49,11 @@ */ public class InfiniteLoopTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test de parser un fichier et déclare le test en echec si il dure * plus de 5s. (bug #697). @@ -55,15 +63,14 @@ @Test(timeout = 5000) public void testInfiniteLoop() throws Exception { URL url = JRSTReaderTest.class.getResource("/bugs/infiniteLoop.rst"); - Document doc = null; Reader in = new InputStreamReader(url.openStream()); try { JRSTReader jrst = new JRSTReader(); - doc = jrst.read(in); + Document doc = jrst.read(in); + Assert.assertNotNull(doc); } finally { in.close(); } - Assert.assertNotNull(doc); } } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TableTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,14 +25,16 @@ package org.nuiton.jrst.bugs; -import java.io.File; - import junit.framework.Assert; - import org.apache.commons.io.FileUtils; +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 tables en général. * @@ -44,6 +46,11 @@ */ public class TableTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que la présence d'un caractères | ne fait pas planter * la generation des tables. @@ -54,7 +61,7 @@ public void testTableSpecialChar() throws Exception { File in = new File("src/test/resources/bugs/testTable1290.rst"); File out = File.createTempFile("jrst-tables", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -71,7 +78,7 @@ public void testTableIndentation() throws Exception { File in = new File("src/test/resources/bugs/testTable1375.rst"); File out = File.createTempFile("jrst-tables", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TextTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,17 +25,19 @@ package org.nuiton.jrst.bugs; -import java.io.File; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import junit.framework.Assert; - import org.apache.commons.io.FileUtils; +import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.nuiton.jrst.JRST; +import org.nuiton.jrst.JRSTCompareDocutils; +import java.io.File; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * Test sur les elements de type text (liens, styles...) * @@ -47,6 +49,11 @@ */ public class TextTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que les liens avec parametres sont correctement parsés. * @@ -56,7 +63,7 @@ public void testLinksParameters() throws Exception { File in = new File("src/test/resources/bugs/testLinks.rst"); File out = File.createTempFile("jrst-testLinks", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -75,7 +82,7 @@ public void testLinksSpecialCharacters() throws Exception { File in = new File("src/test/resources/bugs/testLinks1380.rst"); File out = File.createTempFile("jrst-testLinks", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -93,7 +100,7 @@ public void testTabCharacter() throws Exception { File in = new File("src/test/resources/bugs/testTab1378.rst"); File out = File.createTempFile("jrst-testTab1378", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -111,7 +118,7 @@ public void testOptionLists() throws Exception { File in = new File("src/test/resources/bugs/testOptionsList644.rst"); File out = File.createTempFile("jrst-testOptionList644", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); @@ -135,7 +142,7 @@ public void testLinkEscape() throws Exception { File in = new File("src/test/resources/bugs/testLinks.rst"); File out = File.createTempFile("jrst-testLinks", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out); Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java 2011-06-09 08:55:20 UTC (rev 599) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java 2011-06-09 14:25:13 UTC (rev 600) @@ -25,14 +25,16 @@ package org.nuiton.jrst.bugs; -import java.io.File; - import junit.framework.Assert; - import org.apache.commons.io.FileUtils; +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 titres en général. * @@ -44,6 +46,11 @@ */ public class TitlesTest { + @BeforeClass + public static void beforeClass () throws IOException { + JRSTCompareDocutils.prepareTmpDir(); + } + /** * Test que la génération fonctionne meme s'il n'y a pas de titre * de niveau 2. @@ -53,7 +60,7 @@ public void testNoSubtitle() throws Exception { File in = new File("src/test/resources/bugs/testNoSubtitle.rst"); File out = File.createTempFile("jrst-RstToHtml2", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); } @@ -67,7 +74,7 @@ public void testNoContentBetweenTitles() throws Exception { File in = new File("src/test/resources/bugs/testNoContentSubtitles.rst"); File out = File.createTempFile("jrst-testNoContentSubtitles", ".html"); - out.deleteOnExit(); +// out.deleteOnExit(); JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); String content = FileUtils.readFileToString(out);

1 0