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

r513 - in trunk: doxia-module-jrst/src/license jrst jrst/src/license jrst/src/test/java/org/nuiton/jrst jrst/src/test/resources maven-jrst-plugin/src maven-jrst-plugin/src/license
by tchemit＠users.nuiton.org Nov. 22, 2010

Nov. 22, 2010

Author: tchemit Date: 2010-11-22 16:45:39 +0100 (Mon, 22 Nov 2010) New Revision: 513 Url: http://nuiton.org/repositories/revision/jrst/513 Log: consolidate third-parties = fix tests Added: trunk/jrst/src/test/resources/log4j.properties trunk/maven-jrst-plugin/src/license/ trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties trunk/jrst/pom.xml trunk/jrst/src/license/THIRD-PARTY.properties trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2010-11-22 14:47:17 UTC (rev 512) +++ trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2010-11-22 15:45:39 UTC (rev 513) @@ -3,22 +3,28 @@ # Already used licenses in project : # - Apache License # - Apache License 2.0 +# - BSD License # - Common Public License Version 1.0 +# - Docbook license (MIT-like) # - LGPL # - Lesser General Public License (LGPL) v 3.0 -# - MIT-like License +# - Mozilla Public License version 1.1 # - 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 Jun 28 09:30:13 CEST 2010 -com.ibm.icu--icu4j--2.6.1=X License (http://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.h…) -commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 -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 -xerces--xmlParserAPIs--2.6.2=The Apache Software License, Version 2.0 -xml-apis--xml-apis--1.3.02=The Apache Software License, Version 2.0 +#Mon Nov 22 16:42:48 CET 2010 +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 Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-11-22 14:47:17 UTC (rev 512) +++ trunk/jrst/pom.xml 2010-11-22 15:45:39 UTC (rev 513) @@ -132,6 +132,12 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> </dependencies>  Modified: trunk/jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jrst/src/license/THIRD-PARTY.properties 2010-11-22 14:47:17 UTC (rev 512) +++ trunk/jrst/src/license/THIRD-PARTY.properties 2010-11-22 15:45:39 UTC (rev 513) @@ -2,24 +2,24 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License 2.0 -# - BSD # - BSD License # - Common Public License Version 1.0 # - LGPL # - Lesser General Public License (LGPL) v 3.0 -# - MIT-like License +# - Mozilla Public License version 1.1 # - The Apache Software License, Version 2.0 +# - X License (http://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.h…) # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:27:16 CEST 2010 -com.ibm.icu--icu4j--2.6.1=X License (http://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.h…) -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.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 -xerces--xmlParserAPIs--2.6.2=The Apache Software License, Version 2.0 +#Mon Nov 22 15:54:39 CET 2010 +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.75.2--zip--resources=Docbook license (MIT-like) +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 Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-22 14:47:17 UTC (rev 512) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-22 15:45:39 UTC (rev 513) @@ -25,6 +25,8 @@ package org.nuiton.jrst; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.dom4j.Document; import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; @@ -39,6 +41,7 @@ import junit.framework.Assert; import org.junit.Test; +import org.nuiton.util.FileUtil; /** * JRSTReaderTest. @@ -53,6 +56,9 @@ */ public class JRSTReaderTest { + /** to use log facility, just put in your code: log.info("..."); */ + protected static Log log = LogFactory.getLog(JRSTReaderTest.class); + @Test public void testRead() throws Exception { URL url = JRSTReaderTest.class @@ -62,67 +68,72 @@ JRSTReader jrst = new JRSTReader(); Document doc = jrst.read(in); - { - XMLWriter out = new XMLWriter(System.out, new OutputFormat(" ", - true)); - out.write(doc); - } + log.info(url + " result : \n" + doc.asXML()); + } - // { - // StringWriter out = new StringWriter(); - // JRSTGenerator gen = new JRSTGenerator(out); - // gen.generate(doc); - // System.out.println(out.toString()); - // } - } - @Test - public void testEmptyTableContents() throws Exception{ - URL url = JRSTReaderTest.class.getResource("/testEmptyTableContents.rst"); - Reader in = new InputStreamReader(url.openStream()); - JRSTReader jrst = new JRSTReader(); - Document doc = jrst.read(in); - String XMLexpected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<document id=\"test\" name=\"test\">" + - "<title>Test</title>" + - "<topic class=\"contents\" id=\"table des matières\" name=\"table des matières\">" + - "<title>Table des matières</title>" + - "</topic>" + - "<paragraph>Texte</paragraph>" + - "</document>"; - Assert.assertEquals(XMLexpected, doc.asXML()); + public void testEmptyTableContents() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testEmptyTableContents.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + String xmlexpected = "<topic class=\"contents\" id=\"table des matières\" name=\"table des matières\">" + + "<title>Table des matières</title>" + + "</topic>" + + "<paragraph>Texte</paragraph>" + + "</document>"; + String actualXml = doc.asXML(); + log.info("Test file : " + url); + log.info("Result :\n" + actualXml); + log.info("Expected :\n" + xmlexpected); + + Assert.assertTrue(actualXml.contains(xmlexpected)); } - + @Test public void testExternalLink() throws Exception { - URL url = JRSTReaderTest.class.getResource("/testExternalLink.rst"); - Reader in = new InputStreamReader(url.openStream()); - JRSTReader jrst = new JRSTReader(); - Document doc = jrst.read(in); - String XMLexpected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + - "<document>" + - "<paragraph>External hyperlinks, like <reference name=\"Python\" refuri=\"http://www.python.org/\">Python</reference></paragraph>" + - "<target id=\"python\" name=\"python\" refuri=\"http://www.python.org/\"/>" + - "</document>"; - Assert.assertEquals(XMLexpected, doc.asXML()); + URL url = JRSTReaderTest.class.getResource("/testExternalLink.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + String xmlexpected = "<paragraph>External hyperlinks, like <reference name=\"Python\" refuri=\"http://www.python.org/\">Python</reference></paragraph>" + + "<target id=\"python\" name=\"python\" refuri=\"http://www.python.org/\"/>" + + "</document>"; + + String actualXml = doc.asXML(); + log.info("Test file : " + url); + log.info("Result :\n" + actualXml); + log.info("Expected :\n" + xmlexpected); + + Assert.assertTrue(actualXml.contains(xmlexpected)); } - + @Test public void testHyperlinkTarget() throws Exception { - URL url = JRSTReaderTest.class.getResource("/testHyperlinkTarget.rst"); - Reader in = new InputStreamReader(url.openStream()); - JRSTReader jrst = new JRSTReader(); - Document doc = jrst.read(in); - URL xmlUrl = JRSTReaderTest.class.getResource("/testHyperlinkTarget.xml"); - Reader xmlIn = new InputStreamReader(xmlUrl.openStream()); - BufferedReader reader = new BufferedReader(xmlIn); - String line = null; - StringBuilder stringBuilder = new StringBuilder(); - String ls = System.getProperty("line.separator"); - while ((line = reader.readLine()) != null) { - stringBuilder.append(line); - stringBuilder.append(ls); - } - Assert.assertEquals(stringBuilder.toString(), doc.asXML() + "\n"); + URL url = JRSTReaderTest.class.getResource("/testHyperlinkTarget.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + String actualXml = doc.asXML(); + int index = actualXml.indexOf("<paragraph"); + actualXml = actualXml.substring(index).trim(); + URL xmlUrl = JRSTReaderTest.class.getResource("/testHyperlinkTarget.xml"); + Reader xmlIn = new InputStreamReader(xmlUrl.openStream()); + BufferedReader reader = new BufferedReader(xmlIn); + String line; + StringBuilder buffer = new StringBuilder(); + String ls = System.getProperty("line.separator"); + while ((line = reader.readLine()) != null) { + buffer.append(line); + buffer.append(ls); + } + String xmlexpected = buffer.toString(); + index = xmlexpected.indexOf("<paragraph"); + xmlexpected = xmlexpected.substring(index).trim(); + log.info("Test file : " + url); + log.info("Result :\n" + actualXml); + log.info("Expected :\n" + xmlexpected); + + Assert.assertEquals(xmlexpected, actualXml); } } Added: trunk/jrst/src/test/resources/log4j.properties =================================================================== --- trunk/jrst/src/test/resources/log4j.properties (rev 0) +++ trunk/jrst/src/test/resources/log4j.properties 2010-11-22 15:45:39 UTC (rev 513) @@ -0,0 +1,33 @@ +### +# #%L +# I18n :: Api +# +# $Id$ +# $HeadURL: http://svn.nuiton.org/svn/i18n/trunk/nuiton-i18n/src/test/resources/log4j.p… $ +# %% +# Copyright (C) 2004 - 2010 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% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n +#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X +# package level +log4j.logger.org.nuiton.jrst=INFO Property changes on: trunk/jrst/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties 2010-11-22 15:45:39 UTC (rev 513) @@ -0,0 +1,30 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD License +# - Common Public License Version 1.0 +# - LGPL +# - Lesser General Public License (LGPL) v 3.0 +# - Mozilla Public License version 1.1 +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# 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 Property changes on: trunk/maven-jrst-plugin/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r512 - in trunk: . doxia-module-jrst 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/doc jrst/doc/en jrst/doc/fr jrst/src/main/assembly jrst/src/main/java/org/nuiton/jrst jrst/src/main/java/org/nuiton/jrst/convertisor jrst/src/main/java/org/nuiton/jrst/directive jrst/src/main/resources jrst/src/main/resources
by tchemit＠users.nuiton.org Nov. 22, 2010

Nov. 22, 2010

Author: tchemit Date: 2010-11-22 15:47:17 +0100 (Mon, 22 Nov 2010) New Revision: 512 Url: http://nuiton.org/repositories/revision/jrst/512 Log: normalize svn keywords 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/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/changelog.txt trunk/jrst-doc/pom.xml trunk/jrst-doc/src/site/en/rst/devel/Todo.rst trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png trunk/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png trunk/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png trunk/jrst-doc/src/site/en/rst/devel/library.rst trunk/jrst-doc/src/site/en/rst/index.rst trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst trunk/jrst-doc/src/site/en/rst/user/functionality.rst trunk/jrst-doc/src/site/en/rst/user/images/biohazard.png trunk/jrst-doc/src/site/en/rst/user/index.rst trunk/jrst-doc/src/site/resources/en-redirect.html trunk/jrst-doc/src/site/resources/fr-redirect.html trunk/jrst-doc/src/site/resources/schemas/diagrammeClass.png trunk/jrst-doc/src/site/resources/schemas/diagrammeGeneration.png trunk/jrst-doc/src/site/resources/schemas/diagrammeSequence.png trunk/jrst-doc/src/site/resources/schemas/presentationXSL.png trunk/jrst-doc/src/site/rst/devel/Todo.rst trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst trunk/jrst-doc/src/site/rst/devel/docExterne.rst trunk/jrst-doc/src/site/rst/devel/librairies.rst trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst trunk/jrst-doc/src/site/rst/index.rst trunk/jrst-doc/src/site/rst/user/faq.rst trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst trunk/jrst-doc/src/site/rst/user/images/biohazard.png trunk/jrst-doc/src/site/rst/user/index.rst trunk/jrst-doc/src/site/rst/user/presentationRST.rst trunk/jrst-doc/src/site/site_en.xml trunk/jrst-doc/src/site/site_fr.xml trunk/jrst/LICENSE.txt trunk/jrst/README.txt trunk/jrst/changelog.txt trunk/jrst/doc/Generation.rst trunk/jrst/doc/Parser.rst trunk/jrst/doc/en/index.rst trunk/jrst/doc/fr/DiagrammeClass.png trunk/jrst/doc/fr/DiagrammeSequance.png trunk/jrst/doc/fr/Todo.rst trunk/jrst/doc/fr/biohazard.png trunk/jrst/doc/fr/docDeveloppeur.rst trunk/jrst/doc/fr/docExterne.rst trunk/jrst/doc/fr/fonctionnalites.rst trunk/jrst/doc/fr/librairies.rst trunk/jrst/doc/fr/presentationRST.rst trunk/jrst/doc/fr/presentationXSL.png trunk/jrst/doc/fr/presentationXSL.rst trunk/jrst/doc/index.rst trunk/jrst/doc/new_implementation.rst trunk/jrst/pom.xml trunk/jrst/src/main/assembly/deps.xml trunk/jrst/src/main/assembly/full.xml trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.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/java/org/nuiton/jrst/directive/ContentDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.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/icone/cancel.png trunk/jrst/src/main/resources/icone/more.gif trunk/jrst/src/main/resources/icone/open.png trunk/jrst/src/main/resources/log4j.properties trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd trunk/jrst/src/main/resources/xsl/dn2dbk.xsl trunk/jrst/src/main/resources/xsl/rngrest.xsl trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl trunk/jrst/src/main/resources/xsl/xml2rst.xsl trunk/jrst/src/site/apt/index.apt trunk/jrst/src/site/en/apt/index.apt trunk/jrst/src/site/site_en.xml trunk/jrst/src/site/site_fr.xml trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java trunk/jrst/src/test/resources/bugs/infiniteLoop.rst trunk/jrst/src/test/resources/comparePython.xml trunk/jrst/src/test/resources/definition.rst trunk/jrst/src/test/resources/footnoteTest.rst trunk/jrst/src/test/resources/footnoteTest2.rst trunk/jrst/src/test/resources/frEntier.rst trunk/jrst/src/test/resources/test.rst trunk/jrst/src/test/resources/test2.rst trunk/jrst/src/test/resources/test3.rst trunk/jrst/src/test/resources/test4.rst trunk/jrst/src/test/resources/testEmptyTableContents.rst trunk/jrst/src/test/resources/testExternalLink.rst trunk/jrst/src/test/resources/testHyperlinkTarget.rst trunk/jrst/src/test/resources/testHyperlinkTarget.xml trunk/jrst/src/test/resources/text.rst trunk/jrst/src/test/resources/textEntier.rst trunk/jrst/src/test/resources/textHeader.rst trunk/jrst/src/test/resources/textLiteral.txt trunk/maven-jrst-plugin/LICENSE.txt trunk/maven-jrst-plugin/README.txt trunk/maven-jrst-plugin/changelog.txt trunk/maven-jrst-plugin/doc/index.rst trunk/maven-jrst-plugin/pom.xml trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java 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/maven-jrst-plugin/src/site/site_fr.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 ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/site/apt/devel.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/site/en/apt/devel.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/site/en/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/doxia-module-jrst/src/test/resources/test.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/Generation.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/Parser.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/en/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/DiagrammeClass.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/DiagrammeSequance.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/Todo.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/biohazard.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/docDeveloppeur.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/docExterne.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/fonctionnalites.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/librairies.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/presentationRST.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/presentationXSL.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/fr/presentationXSL.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/doc/new_implementation.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/assembly/deps.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/assembly/full.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/DocumentHandler.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/DocumentWalker.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRST.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTDirective.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTInterface.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/ReStructuredText.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtils2RST.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/convertisor/DocUtilsVisitor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ContentDirective.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/DateDirective.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/ImageDirective.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/java/org/nuiton/jrst/directive/SectnumDirective.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/icone/cancel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/icone/more.gif ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/icone/open.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/xsl/dn2dbk.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/xsl/rngrest.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/main/resources/xsl/xml2rst.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/site/en/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/GutterColor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTGeneratorTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/ThreadRedirection.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/XMLCaseTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/bugs/infiniteLoop.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/comparePython.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/definition.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/footnoteTest.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/footnoteTest2.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/frEntier.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/test.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/test2.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/test3.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/test4.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/testEmptyTableContents.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/testExternalLink.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/testHyperlinkTarget.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/testHyperlinkTarget.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/text.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/textEntier.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/textHeader.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst/src/test/resources/textLiteral.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/Todo.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/developerDoc.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/externalDoc.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/devel/library.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/user/RSTpresentation.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/user/functionality.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/user/images/biohazard.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/en/rst/user/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/resources/en-redirect.html ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/resources/fr-redirect.html ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/resources/schemas/diagrammeClass.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/resources/schemas/diagrammeGeneration.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/resources/schemas/diagrammeSequence.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/resources/schemas/presentationXSL.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/devel/Todo.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/devel/docDeveloppeur.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/devel/docExterne.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/devel/librairies.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/devel/presentationXSL.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/user/faq.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/user/fonctionnalites.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/user/images/biohazard.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/user/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/rst/user/presentationRST.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/jrst-doc/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/doc/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/main/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/site/en/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-jrst-plugin/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/site/en/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL

1 0

r511 - in trunk: doxia-module-jrst/src/test/resources jrst/src/main/assembly jrst/src/main/resources jrst/src/main/resources/xsl jrst/src/test/resources jrst/src/test/resources/bugs jrst-doc/src/site/resources maven-jrst-plugin/src/main/resources
by tchemit＠users.nuiton.org Nov. 22, 2010

Nov. 22, 2010

Author: tchemit Date: 2010-11-22 15:46:40 +0100 (Mon, 22 Nov 2010) New Revision: 511 Url: http://nuiton.org/repositories/revision/jrst/511 Log: update file header Modified: trunk/doxia-module-jrst/src/test/resources/test.rst trunk/jrst-doc/src/site/resources/en-redirect.html trunk/jrst-doc/src/site/resources/fr-redirect.html trunk/jrst/src/main/assembly/deps.xml trunk/jrst/src/main/assembly/full.xml trunk/jrst/src/main/resources/log4j.properties trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd trunk/jrst/src/main/resources/xsl/dn2dbk.xsl trunk/jrst/src/main/resources/xsl/rngrest.xsl trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl trunk/jrst/src/main/resources/xsl/xml2rst.xsl trunk/jrst/src/test/resources/bugs/infiniteLoop.rst trunk/jrst/src/test/resources/comparePython.xml trunk/jrst/src/test/resources/definition.rst trunk/jrst/src/test/resources/footnoteTest.rst trunk/jrst/src/test/resources/footnoteTest2.rst trunk/jrst/src/test/resources/frEntier.rst trunk/jrst/src/test/resources/test.rst trunk/jrst/src/test/resources/test2.rst trunk/jrst/src/test/resources/test3.rst trunk/jrst/src/test/resources/test4.rst trunk/jrst/src/test/resources/testEmptyTableContents.rst trunk/jrst/src/test/resources/testExternalLink.rst trunk/jrst/src/test/resources/testHyperlinkTarget.rst trunk/jrst/src/test/resources/testHyperlinkTarget.xml trunk/jrst/src/test/resources/text.rst trunk/jrst/src/test/resources/textEntier.rst trunk/jrst/src/test/resources/textHeader.rst trunk/maven-jrst-plugin/src/main/resources/log4j.properties Modified: trunk/doxia-module-jrst/src/test/resources/test.rst =================================================================== --- trunk/doxia-module-jrst/src/test/resources/test.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/doxia-module-jrst/src/test/resources/test.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Doxia module +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - .. comment Title Modified: trunk/jrst/src/main/assembly/deps.xml =================================================================== --- trunk/jrst/src/main/assembly/deps.xml 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/main/assembly/deps.xml 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ + <assembly> <id>deps</id> <formats> Modified: trunk/jrst/src/main/assembly/full.xml =================================================================== --- trunk/jrst/src/main/assembly/full.xml 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/main/assembly/full.xml 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ + <assembly> <id>full</id> <formats> Modified: trunk/jrst/src/main/resources/log4j.properties =================================================================== --- trunk/jrst/src/main/resources/log4j.properties 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/main/resources/log4j.properties 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +### +# #%L +# JRst :: Api +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout Modified: trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd =================================================================== --- trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/main/resources/xsl/XSLT-xsl.dtd 2010-11-22 14:46:40 UTC (rev 511) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + +  Modified: trunk/jrst/src/main/resources/xsl/dn2dbk.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/dn2dbk.xsl 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/main/resources/xsl/dn2dbk.xsl 2010-11-22 14:46:40 UTC (rev 511) @@ -1,5 +1,30 @@ <?xml version="1.0" encoding="UTF-8" ?>  + + +  + <xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/TR/xhtml1/strict"> Modified: trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/main/resources/xsl/rst2xhtml.xsl 2010-11-22 14:46:40 UTC (rev 511) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> + + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/TR/xhtml1/strict"> Modified: trunk/jrst/src/main/resources/xsl/xml2rst.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/xml2rst.xsl 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/main/resources/xsl/xml2rst.xsl 2010-11-22 14:46:40 UTC (rev 511) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> + + <!DOCTYPE xsl:stylesheet [ <!ENTITY CR "
">  Modified: trunk/jrst/src/test/resources/bugs/infiniteLoop.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/infiniteLoop.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/bugs/infiniteLoop.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - Developer guide for working with Mifos internationalization, specifically as relates to making translation files work with the online translation tool. Goals Modified: trunk/jrst/src/test/resources/comparePython.xml =================================================================== --- trunk/jrst/src/test/resources/comparePython.xml 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/comparePython.xml 2010-11-22 14:46:40 UTC (rev 511) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> + + <!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">  <document id="parseur-restructuredtext-le-jrst" name="parseur restructuredtext : le jrst" source="/home/letellier/PROJET/jrst2/src/test/org/codelutin/jrst/frEntier.rst"><title>Parseur reStructuredText : le JRst</title><docinfo><author>Sylvain LETELLIER <<reference refuri="mailto:letellier@codelutin">letellier@codelutin</reference>></author><organization>Code Lutin</organization><date>$date: 01/06/2007$</date><copyright>© 2007. JRST - Code Lutin - GPL</copyright></docinfo><topic class="contents" id="sommaire" name="sommaire"><title>Sommaire</title><bullet_list class="auto-toc"><list_item><paragraph><reference id="id25" refid="documentation-utilisateur"><generated class="sectnum">1 </generated>Documentation utilisateur</reference></paragraph><bullet_list class="auto-toc"><list_item><paragraph><reference id="id26" refid="pr-sentation"><generated class="sectnum">1.1 </generated>Présentation</reference></paragraph></list_item><list_item><paragraph><reference id="id27" refid="usage"><generated class="sectnum">1.2 </generated>Usage</reference></paragraph></list_item><list_item><paragraph><reference id="id28" refid="plugin-maven"><generated class="sectnum">1.3 </generated>Plugin maven</reference></paragraph></list_item></bullet_list></list_item><list_item><paragraph><reference id="id29" refid="introduction-restructuredtext"><generated class="sectnum">2 </generated>Introduction à ReStructuredText</reference></paragraph><bullet_list class="auto-toc"><list_item><paragraph><reference id="id30" refid="structure"><generated class="sectnum">2.1 </generated>Structure</reference></paragraph></list_item><list_item><paragraph><reference id="id31" refid="styles-de-texte"><generated class="sectnum">2.2 </generated>Styles de texte</reference></paragraph></list_item><list_item><paragraph><reference id="id32" refid="listes"><generated class="sectnum">2.3 </generated>Listes</reference></paragraph></list_item><list_item><paragraph><reference id="id33" refid="pr-formatage"><generated class="sectnum">2.4 </generated>Préformatage</reference></paragraph></list_item><list_item><paragraph><reference id="id34" refid="sections"><generated class="sectnum">2.5 </generated>Sections</reference></paragraph></list_item><list_item><paragraph><reference id="id35" refid="images"><generated class="sectnum">2.6 </generated>Images</reference></paragraph></list_item><list_item><paragraph><reference id="id36" refid="et-ensuite"><generated class="sectnum">2.7 </generated>Et ensuite ?</reference></paragraph></list_item></bullet_list></list_item><list_item><paragraph><reference id="id37" refid="le-xsl-extensible-stylesheets-language"><generated class="sectnum">3 </generated>Le XSL (Extensible Stylesheets Language)</reference></paragraph><bullet_list class="auto-toc"><list_item><paragraph><reference id="id38" refid="id19"><generated class="sectnum">3.1 </generated>Présentation</reference></paragraph></list_item><list_item><paragraph><reference id="id39" refid="structure-d-un-document-xsl"><generated class="sectnum">3.2 </generated>Structure d'un document XSL</reference></paragraph></list_item><list_item><paragraph><reference id="id40" refid="association-d-une-feuille-xsl-un-document-xml"><generated class="sectnum">3.3 </generated>Association d'une feuille XSL à un document XML</reference></paragraph></list_item><list_item><paragraph><reference id="id41" refid="les-template-rules-r-gles-de-gabarit"><generated class="sectnum">3.4 </generated>Les template rules (règles de gabarit)</reference></paragraph></list_item><list_item><paragraph><reference id="id42" refid="r-f-rences"><generated class="sectnum">3.5 </generated>Références</reference></paragraph></list_item></bullet_list></list_item><list_item><paragraph><reference id="id43" refid="documentation-d-veloppeur"><generated class="sectnum">4 </generated>Documentation développeur</reference></paragraph><bullet_list class="auto-toc"><list_item><paragraph><reference id="id44" refid="le-diagramme-de-class"><generated class="sectnum">4.1 </generated>Le diagramme de Class</reference></paragraph></list_item><list_item><paragraph><reference id="id45" refid="la-g-n-ration"><generated class="sectnum">4.2 </generated>La génération</reference></paragraph></list_item><list_item><paragraph><reference id="id46" refid="exemple-d-utilisation"><generated class="sectnum">4.3 </generated>Exemple d'utilisation</reference></paragraph></list_item></bullet_list></list_item><list_item><paragraph><reference id="id47" refid="fonctionnalit-s-propos-es"><generated class="sectnum">5 </generated>Fonctionnalités proposées</reference></paragraph><bullet_list class="auto-toc"><list_item><paragraph><reference id="id48" refid="fonctionnalit-s-implant-es"><generated class="sectnum">5.1 </generated>Fonctionnalités implantées</reference></paragraph><bullet_list class="auto-toc"><list_item><paragraph><reference id="id49" refid="element-racine"><generated class="sectnum">5.1.1 </generated>Element racine</reference></paragraph></list_item><list_item><paragraph><reference id="id50" refid="elements-titre"><generated class="sectnum">5.1.2 </generated>Elements titre</reference></paragraph></list_item><list_item><paragraph><reference id="id51" refid="elements-bibliographiques"><generated class="sectnum">5.1.3 </generated>Elements bibliographiques</reference></paragraph></list_item><list_item><paragraph><reference id="id52" refid="elements-de-d-coration"><generated class="sectnum">5.1.4 </generated>Elements de décoration</reference></paragraph></list_item><list_item><paragraph><reference id="id53" refid="elements-structurels"><generated class="sectnum">5.1.5 </generated>Elements structurels</reference></paragraph></list_item><list_item><paragraph><reference id="id54" refid="elements-du-corps"><generated class="sectnum">5.1.6 </generated>Elements du corps</reference></paragraph></list_item><list_item><paragraph><reference id="id55" refid="elements-des-tableaux"><generated class="sectnum">5.1.7 </generated>Elements des tableaux</reference></paragraph></list_item><list_item><paragraph><reference id="id56" refid="elements-de-la-ligne"><generated class="sectnum">5.1.8 </generated>Elements de la ligne</reference></paragraph></list_item></bullet_list></list_item><list_item><paragraph><reference id="id57" refid="fonctionnalit-s-non-implant-es"><generated class="sectnum">5.2 </generated>Fonctionnalités non-implantées</reference></paragraph></list_item></bullet_list></list_item><list_item><paragraph><reference id="id58" refid="les-diff-rentes-librairies-utilis-es"><generated class="sectnum">6 </generated>Les différentes librairies utilisées</reference></paragraph><bullet_list class="auto-toc"><list_item><paragraph><reference id="id59" refid="dom4j"><generated class="sectnum">6.1 </generated>dom4j</reference></paragraph></list_item><list_item><paragraph><reference id="id60" refid="javax-xml-transform"><generated class="sectnum">6.2 </generated>javax.xml.transform</reference></paragraph></list_item><list_item><paragraph><reference id="id61" refid="sdoc"><generated class="sectnum">6.3 </generated>SDoc</reference></paragraph></list_item><list_item><paragraph><reference id="id62" refid="xmlunit"><generated class="sectnum">6.4 </generated>Xmlunit</reference></paragraph></list_item></bullet_list></list_item><list_item><paragraph><reference id="id63" refid="documentation-externe"><generated class="sectnum">7 </generated>Documentation externe</reference></paragraph></list_item></bullet_list></topic><section id="documentation-utilisateur" name="documentation utilisateur"><title auto="1" refid="id25"><generated class="sectnum">1 </generated>Documentation utilisateur</title><section dupname="présentation" id="pr-sentation"><title auto="1" refid="id26"><generated class="sectnum">1.1 </generated>Présentation</title><paragraph>Le format reStructuredText est un format de description de documents. A l'image Modified: trunk/jrst/src/test/resources/definition.rst =================================================================== --- trunk/jrst/src/test/resources/definition.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/definition.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - term 1 Definition 1. Modified: trunk/jrst/src/test/resources/footnoteTest.rst =================================================================== --- trunk/jrst/src/test/resources/footnoteTest.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/footnoteTest.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - Autonumbered footnotes are possible, like using [#]_ and [#]_. Modified: trunk/jrst/src/test/resources/footnoteTest2.rst =================================================================== --- trunk/jrst/src/test/resources/footnoteTest2.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/footnoteTest2.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - Auto-symbol footnotes are also possible, like this: [*]_ and [*]_ [*]_ [*]_ [*]_ [*]_ [*]_ [*]_ [*]_ [*]_ [*]_ [*]_ [1]_ aaaa_. Modified: trunk/jrst/src/test/resources/frEntier.rst =================================================================== --- trunk/jrst/src/test/resources/frEntier.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/frEntier.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - ================================== Parseur reStructuredText : le JRst ================================== Modified: trunk/jrst/src/test/resources/test.rst =================================================================== --- trunk/jrst/src/test/resources/test.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/test.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - ===================================== An Introduction to reStructuredText ===================================== Modified: trunk/jrst/src/test/resources/test2.rst =================================================================== --- trunk/jrst/src/test/resources/test2.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/test2.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - ===================================== An Introduction to reStructuredText ===================================== Modified: trunk/jrst/src/test/resources/test3.rst =================================================================== --- trunk/jrst/src/test/resources/test3.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/test3.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - ====================== Introduction to Prest ====================== Modified: trunk/jrst/src/test/resources/test4.rst =================================================================== --- trunk/jrst/src/test/resources/test4.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/test4.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - ===================================== Tutoriel pour la création d'un module ===================================== Modified: trunk/jrst/src/test/resources/testEmptyTableContents.rst =================================================================== --- trunk/jrst/src/test/resources/testEmptyTableContents.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/testEmptyTableContents.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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 ---- Modified: trunk/jrst/src/test/resources/testExternalLink.rst =================================================================== --- trunk/jrst/src/test/resources/testExternalLink.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/testExternalLink.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - External hyperlinks, like Python_. .. _Python: http://www.python.org/ Modified: trunk/jrst/src/test/resources/testHyperlinkTarget.rst =================================================================== --- trunk/jrst/src/test/resources/testHyperlinkTarget.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/testHyperlinkTarget.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - (External) hyperlinks, like Python_. .. _Python: http://www.python.org/ Modified: trunk/jrst/src/test/resources/testHyperlinkTarget.xml =================================================================== --- trunk/jrst/src/test/resources/testHyperlinkTarget.xml 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/testHyperlinkTarget.xml 2010-11-22 14:46:40 UTC (rev 511) @@ -1,2 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <document><paragraph>(External) hyperlinks, like <reference name="Python" refuri="http://www.python.org/">Python</reference></paragraph><target id="python" name="python" refuri="http://www.python.org/"/><paragraph>(External) hyperlinks, like <reference name="Pythoné" refuri="http://www.python.org/">Pythoné</reference></paragraph><target id="python%C3%A9" name="pythoné" refuri="http://www.python.org/"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de depouillement (votecounting)" refuri="http://www.votecounting.com">Module de depouillement (votecounting)</reference></paragraph></list_item></bullet_list><target id="module-de-depouillement-%28votecounting%29" name="module de depouillement (votecounting)" refuri="http://www.votecounting.com"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de depouillement (votecounting)!@#$%&*" refuri="http://www.votecounting.com">Module de depouillement (votecounting)!@#$%&*</reference></paragraph></list_item></bullet_list><target id="module-de-depouillement-%28votecounting%29%21%40%23%24%25%26*" name="module de depouillement (votecounting)!@#$%&*" refuri="http://www.votecounting.com"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de dépouillement (votecounting)" refuri="votecounting.html">Module de dépouillement (votecounting)</reference></paragraph></list_item></bullet_list><target id="module-de-d%C3%A9pouillement-%28votecounting%29" name="module de dépouillement (votecounting)" refuri="votecounting.html"/></document> \ No newline at end of file Modified: trunk/jrst/src/test/resources/text.rst =================================================================== --- trunk/jrst/src/test/resources/text.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/text.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - ============== Le grand titre ============== Modified: trunk/jrst/src/test/resources/textEntier.rst =================================================================== --- trunk/jrst/src/test/resources/textEntier.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/textEntier.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - ============== Le grand titre ============== Modified: trunk/jrst/src/test/resources/textHeader.rst =================================================================== --- trunk/jrst/src/test/resources/textHeader.rst 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst/src/test/resources/textHeader.rst 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * JRst :: Api +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 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% +.. - :authors: Benjamin POUSSIN <poussin@codelutin> ; Sylvain LETELLIER <letellier@codelutin> :organization: Code Lutin :address: 6 chemin des Orans @@ -10,4 +34,4 @@ de null part avec meme un para -:copyright: � 2007. JRST - Code Lutin - GPL +:copyright: � 2007. JRST - Code Lutin - GPL Modified: trunk/jrst-doc/src/site/resources/en-redirect.html =================================================================== --- trunk/jrst-doc/src/site/resources/en-redirect.html 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst-doc/src/site/resources/en-redirect.html 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ + <html> <head> <title>JRst</title> Modified: trunk/jrst-doc/src/site/resources/fr-redirect.html =================================================================== --- trunk/jrst-doc/src/site/resources/fr-redirect.html 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/jrst-doc/src/site/resources/fr-redirect.html 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ + <html> <head> <title>JRst</title> Modified: trunk/maven-jrst-plugin/src/main/resources/log4j.properties =================================================================== --- trunk/maven-jrst-plugin/src/main/resources/log4j.properties 2010-11-22 14:45:59 UTC (rev 510) +++ trunk/maven-jrst-plugin/src/main/resources/log4j.properties 2010-11-22 14:46:40 UTC (rev 511) @@ -1,3 +1,27 @@ +### +# #%L +# JRst :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 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% +### # Global logging configuration log4j.rootLogger=ERROR, stdout # Console output...

1 0

r510 - in trunk: . doxia-module-jrst jrst maven-jrst-plugin
by tchemit＠users.nuiton.org Nov. 22, 2010

Nov. 22, 2010

Author: tchemit Date: 2010-11-22 15:45:59 +0100 (Mon, 22 Nov 2010) New Revision: 510 Url: http://nuiton.org/repositories/revision/jrst/510 Log: Evolution #1090: Optimize dependencies Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2010-11-22 14:21:29 UTC (rev 509) +++ trunk/doxia-module-jrst/pom.xml 2010-11-22 14:45:59 UTC (rev 510) @@ -24,123 +24,136 @@ #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> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jrst</artifactId> + <version>1.2-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jrst</artifactId> - <version>${project.version}</version> - <scope>compile</scope> -  - <exclusions> - <exclusion> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jrst</artifactId> + <version>${project.version}</version> + <scope>compile</scope> +  + <exclusions> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-xdoc</artifactId> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <type>test-jar</type> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <type>test-jar</type> + </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>runtime</scope> + </dependency> - </dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  -  -  + </dependencies> - <name>JRst :: Doxia module</name> - <description>JRst module for doxia</description> - <inceptionYear>2009</inceptionYear> +  +  +  - <developers> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com - </email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com - </email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> + <name>JRst :: Doxia module</name> + <description>JRst module for doxia</description> + <inceptionYear>2009</inceptionYear> -  -  -  - <packaging>jar</packaging> + <developers> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com + </email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com + </email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <build> +  +  +  + <packaging>jar</packaging> - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - <executions> - <execution> - <goals> - <goal>descriptor</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - + <build> + + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> + <executions> + <execution> + <goals> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2010-11-22 14:21:29 UTC (rev 509) +++ trunk/jrst/pom.xml 2010-11-22 14:45:59 UTC (rev 510) @@ -24,238 +24,266 @@ #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> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> - </parent> - - <groupId>org.nuiton.jrst</groupId> + <parent> + <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> + <version>1.2-SNAPSHOT</version> + </parent> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <scope>compile</scope> - </dependency> -  - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>fop</artifactId> - </dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> -  - <dependency> - <groupId>uk.co.flamingpenguin.jewelcli</groupId> - <artifactId>jewelcli</artifactId> - </dependency> -  - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </dependency> -  - <dependency> - <groupId>xalan</groupId> - <artifactId>serializer</artifactId> - </dependency> -  - <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>sdoc</artifactId> -  - </dependency> -  - <dependency> - <groupId>net.sf.docbook</groupId> - <artifactId>docbook-xsl</artifactId> - <type>zip</type> - <classifier>resources</classifier> - </dependency> -  - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <dependencies> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> -  -  -  + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + </dependency> - <name>JRst :: Api</name> - <description>Parser RST en Java.</description> - <inceptionYear>2004</inceptionYear> +  + <dependency> + <groupId>uk.co.flamingpenguin.jewelcli</groupId> + <artifactId>jewelcli</artifactId> + </dependency> +  + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </dependency> +  + <dependency> + <groupId>xalan</groupId> + <artifactId>serializer</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>sdoc</artifactId> +  + </dependency> +  + <dependency> + <groupId>net.sf.docbook</groupId> + <artifactId>docbook-xsl</artifactId> + <type>zip</type> + <classifier>resources</classifier> + <scope>runtime</scope> + </dependency> +  + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> -  -  -  - <packaging>jar</packaging> +  +  +  - <properties> + <name>JRst :: Api</name> + <description>Parser RST en Java.</description> + <inceptionYear>2004</inceptionYear> - <maven.jar.main.class>org.nuiton.jrst.JRST</maven.jar.main.class> +  +  +  + <packaging>jar</packaging> -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + <properties> - </properties> + <maven.jar.main.class>org.nuiton.jrst.JRST</maven.jar.main.class> - <build> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - <plugins> + </properties> -  - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> + <build> -  + <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> -  - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <silent>true</silent> - </configuration> - </execution> - </executions> - </plugin> +  + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> - </plugins> +  - <pluginManagement> - <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> +  + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - <link>http://maven-site.nuiton.org/nuiton-utils/apidocs/</link> - </links> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> + </plugins> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> - </build> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://maven-site.nuiton.org/nuiton-utils/apidocs/</link> + </links> + </configuration> + </plugin> -  -  -  + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> -  - <profiles> + </plugins> + </pluginManagement> -  - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + </build> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> +  +  +  - </plugins> +  + <profiles> - </build> - </profile> - </profiles> +  + <profile> + <id>release-assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2010-11-22 14:21:29 UTC (rev 509) +++ trunk/maven-jrst-plugin/pom.xml 2010-11-22 14:45:59 UTC (rev 510) @@ -24,63 +24,70 @@ #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> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jrst</artifactId> + <version>1.2-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.jrst</groupId> - <artifactId>maven-jrst-plugin</artifactId> + <groupId>org.nuiton.jrst</groupId> + <artifactId>maven-jrst-plugin</artifactId> - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jrst</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jrst</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> - </dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> -  -  -  - <name>JRst :: Maven plugin</name> - <description> - Maven2 plugin to generate reStructuredText file into xDoc. - </description> - <inceptionYear>2006</inceptionYear> - -  -  -  - <packaging>maven-plugin</packaging> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + </dependencies> + +  +  +  + <name>JRst :: Maven plugin</name> + <description> + Maven2 plugin to generate reStructuredText file into xDoc. + </description> + <inceptionYear>2006</inceptionYear> + +  +  +  + <packaging>maven-plugin</packaging> + <profiles>  Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-22 14:21:29 UTC (rev 509) +++ trunk/pom.xml 2010-11-22 14:45:59 UTC (rev 510) @@ -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> @@ -58,6 +60,12 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helperPluginVersion}</version> @@ -139,7 +147,14 @@ </exclusions> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.15</version> + </dependency> + + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <version>1.2</version> @@ -167,6 +182,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + </dependency> +  @@ -203,6 +224,12 @@ <artifactId>jaxen</artifactId> <version>1.1.1</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -243,18 +270,19 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + <version>${doxiaVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> <type>test-jar</type> <version>${doxiaVersion}</version> <scope>test</scope> </dependency> -  - </dependencies> </dependencyManagement> @@ -329,9 +357,7 @@ <nuitonUtilsVersion>1.4.1</nuitonUtilsVersion> <nuitonI18nVersion>2.0</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> - -  -  + </properties> <build> @@ -363,4 +389,15 @@ <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> + <profiles> +  + <profile> + <id>extra-modules-profile</id> + + <modules> + <module>maven-jrst-plugin</module> + </modules> + </profile> + </profiles> + </project>

1 0

r509 - in trunk: . jrst/src/main/resources/i18n
by tchemit＠users.nuiton.org Nov. 22, 2010

Nov. 22, 2010

Author: tchemit Date: 2010-11-22 15:21:29 +0100 (Mon, 22 Nov 2010) New Revision: 509 Url: http://nuiton.org/repositories/revision/jrst/509 Log: Evolution #1089: Update I18n to 2.0 (rename also i18n bundles) clean pom Added: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties Removed: trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties Modified: trunk/pom.xml Deleted: trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties 2010-11-21 14:30:04 UTC (rev 508) +++ trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -1,20 +0,0 @@ -JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s=JRST parsing error line %d char %s\:\\n%s -annuler=.. to cancel or return to parent directory -btnCancel=Cancel -btnConvert=Convert -dontExist=Invalid file path -entrer=Enter to display file list, or to complete path -exit=Enter "\!q" to exit -externalXSL=External(s) XSL(s) -help?=JRST --help to display help -open=Open file \: -openEmpty?=This field must be filled in. -other?=Want you add an other XSL file ?(y/n) -outputFile?=Please enter output path (empty to display in console) -outputFormat?=Please enter output format (xhtml, docbook, xml(by default), html, xdoc, rst, pdf, odt ou rtf)\n(empty to enter XSL files to use) -overwrite?=This file exists, do you want to overwrite it ? (y/n) -overwriteGraph?=This file exists, do you want to overwrite it ? -rstFile?=Please enter reStructuredText file path (empty to exit) -save=Enter "\!s" in the end of the file name to save -saveAs=Save as \: -xslFile?=Please enter XSL file path (XML output if empty) Deleted: trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties 2010-11-21 14:30:04 UTC (rev 508) +++ trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -1,20 +0,0 @@ -JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s= -annuler=.. pour annuler ou pour revenir au repertoire precedent -btnCancel=Annuler -btnConvert=Convertir -dontExist=Ce fichier n'existe pas -entrer=Entrer pour afficher la liste des fichiers, ou pour completer le chemin -exit=Saisir "\!q" pour quitter -externalXSL=XSL(s) externe(s) -help?=JRST --help pour afficher l'aide -open=Ouvrir le fichier \: -openEmpty?=Ce champ doit etre rempli. -other?=Voulez-vous ajouter un autre fichier XSL ?(o/n) -outputFile?=Veuillez saisir le chemin du fichier sortie (Laissez vide pour l'afficher dans la sortie standard) -outputFormat?=Veuillez saisir le format de sortie (xhtml, docbook, xml(par default), html, xdoc, rst, pdf, odt ou rtf)\n(Laissez vide pour specifier le ou les XSL de generations \u00E0 utiliser) -overwrite?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ?(o/n) -overwriteGraph?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ? -rstFile?=Veuillez saisir le chemin du fichier reStructuredText (Laissez vide pour quitter) -save=Saisir "\!s" a la fin du nom de fichier pour l'enregistrer -saveAs=Enregistrer sous \: -xslFile?=Veuillez saisir le chemin du fichier XSL (Sortie XML si vide) Copied: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties (from rev 507, trunk/jrst/src/main/resources/i18n/jrst-en_GB.properties) =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties (rev 0) +++ trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -0,0 +1,20 @@ +JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s=JRST parsing error line %d char %s\:\\n%s +annuler=.. to cancel or return to parent directory +btnCancel=Cancel +btnConvert=Convert +dontExist=Invalid file path +entrer=Enter to display file list, or to complete path +exit=Enter "\!q" to exit +externalXSL=External(s) XSL(s) +help?=JRST --help to display help +open=Open file \: +openEmpty?=This field must be filled in. +other?=Want you add an other XSL file ?(y/n) +outputFile?=Please enter output path (empty to display in console) +outputFormat?=Please enter output format (xhtml, docbook, xml(by default), html, xdoc, rst, pdf, odt ou rtf)\n(empty to enter XSL files to use) +overwrite?=This file exists, do you want to overwrite it ? (y/n) +overwriteGraph?=This file exists, do you want to overwrite it ? +rstFile?=Please enter reStructuredText file path (empty to exit) +save=Enter "\!s" in the end of the file name to save +saveAs=Save as \: +xslFile?=Please enter XSL file path (XML output if empty) Property changes on: trunk/jrst/src/main/resources/i18n/jrst_en_GB.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Copied: trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties (from rev 507, trunk/jrst/src/main/resources/i18n/jrst-fr_FR.properties) =================================================================== --- trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties (rev 0) +++ trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties 2010-11-22 14:21:29 UTC (rev 509) @@ -0,0 +1,20 @@ +JRST\ parsing\ error\ line\ %d\ char\ %s\:\\n%s= +annuler=.. pour annuler ou pour revenir au repertoire precedent +btnCancel=Annuler +btnConvert=Convertir +dontExist=Ce fichier n'existe pas +entrer=Entrer pour afficher la liste des fichiers, ou pour completer le chemin +exit=Saisir "\!q" pour quitter +externalXSL=XSL(s) externe(s) +help?=JRST --help pour afficher l'aide +open=Ouvrir le fichier \: +openEmpty?=Ce champ doit etre rempli. +other?=Voulez-vous ajouter un autre fichier XSL ?(o/n) +outputFile?=Veuillez saisir le chemin du fichier sortie (Laissez vide pour l'afficher dans la sortie standard) +outputFormat?=Veuillez saisir le format de sortie (xhtml, docbook, xml(par default), html, xdoc, rst, pdf, odt ou rtf)\n(Laissez vide pour specifier le ou les XSL de generations \u00E0 utiliser) +overwrite?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ?(o/n) +overwriteGraph?=Ce fichier existe, etes-vous sur de vouloir ecraser le fichier ? +rstFile?=Veuillez saisir le chemin du fichier reStructuredText (Laissez vide pour quitter) +save=Saisir "\!s" a la fin du nom de fichier pour l'enregistrer +saveAs=Enregistrer sous \: +xslFile?=Veuillez saisir le chemin du fichier XSL (Sortie XML si vide) Property changes on: trunk/jrst/src/main/resources/i18n/jrst_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Added: svn:mergeinfo + Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:30:04 UTC (rev 508) +++ trunk/pom.xml 2010-11-22 14:21:29 UTC (rev 509) @@ -50,11 +50,6 @@ <dependencyManagement> <dependencies> -  - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -161,14 +156,14 @@ <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <version>2.7.1</version> + <version>${xalanVersion}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>serializer</artifactId> - <version>2.7.1</version> + <version>${xalanVersion}</version> <scope>runtime</scope> </dependency> @@ -310,7 +305,7 @@ <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>developer</role> </roles> </developer> </developers> @@ -332,9 +327,11 @@ <doxiaVersion>1.1.3</doxiaVersion> <nuitonUtilsVersion>1.4.1</nuitonUtilsVersion> - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonI18nVersion>2.0</nuitonI18nVersion> + <xalanVersion>2.7.1</xalanVersion> +  - <maven.test.failure.ignore>true</maven.test.failure.ignore> +  </properties> <build> @@ -360,7 +357,8 @@  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/jrst/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm>

1 0

r508 - trunk
by tchemit＠users.nuiton.org Nov. 21, 2010

Nov. 21, 2010

Author: tchemit Date: 2010-11-21 15:30:04 +0100 (Sun, 21 Nov 2010) New Revision: 508 Url: http://nuiton.org/repositories/revision/jrst/508 Log: Update mavenpom4redmineAndCentral to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-19 10:17:13 UTC (rev 507) +++ trunk/pom.xml 2010-11-21 14:30:04 UTC (rev 508) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4</version> + <version>2.4.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r507 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst test/resources
by vbriand＠users.nuiton.org Nov. 19, 2010

Nov. 19, 2010

Author: vbriand Date: 2010-11-19 11:17:13 +0100 (Fri, 19 Nov 2010) New Revision: 507 Url: http://nuiton.org/repositories/revision/jrst/507 Log: Special characters in hyperlinks targets are now managed correctly Added: trunk/jrst/src/test/resources/testHyperlinkTarget.rst trunk/jrst/src/test/resources/testHyperlinkTarget.xml Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-11-12 17:13:57 UTC (rev 506) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2010-11-19 10:17:13 UTC (rev 507) @@ -32,9 +32,12 @@ import java.io.IOException; import java.io.Reader; +import java.net.URLEncoder; +import java.text.Normalizer; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -1994,7 +1997,7 @@ endPeek(); return result; } - + public Element peekTarget() throws IOException { beginPeek(); @@ -2006,8 +2009,8 @@ Matcher matcher = Pattern.compile("\\.\\.\\s_").matcher(line); if (matcher.find()) { int i = line.indexOf(':'); - result.addAttribute("id", line.substring(matcher.end(), i) - .replaceAll("\\W", "-").toLowerCase()); + result.addAttribute("id", URLEncoder.encode(line.substring(matcher.end(), i) + .toLowerCase().replaceAll(" ", "-"), "UTF-8")); result.addAttribute("level", "" + level(line)); } } @@ -2039,9 +2042,8 @@ "" + level(line)); result.getLast().addAttribute( "id", - line.substring(matcher.end(), i) - .replaceAll("\\W", "-") - .toLowerCase()); + URLEncoder.encode(line.substring(matcher.end(), i) + .replaceAll(" ", "-").toLowerCase(), "UTF-8")); result.getLast().addAttribute( "name", line.substring(matcher.end(), i) Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-11-12 17:13:57 UTC (rev 506) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2010-11-19 10:17:13 UTC (rev 507) @@ -121,7 +121,10 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.StringReader; +import java.io.UnsupportedEncodingException; import java.net.URL; +import java.net.URLEncoder; +import java.text.Normalizer; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -144,6 +147,7 @@ import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.dom4j.Element; +import org.dom4j.IllegalAddException; import org.dom4j.Node; import org.dom4j.VisitorSupport; @@ -479,7 +483,11 @@ if (log.isWarnEnabled()) { log.warn("Can't inline text for " + e, eee); } - } + } catch (UnsupportedEncodingException ee) { + if (log.isWarnEnabled()) { + log.warn("Unsupported encoding " + e, ee); + } + } } } }); @@ -894,7 +902,7 @@ while (!lexer.eof() && itemNotEquals(TITLE, item) && isUpperLevel(item, parent)) { if (itemEquals(JRSTLexer.BLANK_LINE, item)) { - // go t o the next element + // go to the next element lexer.remove(); } else if (itemEquals("remove", item)) { lexer.remove(); @@ -973,7 +981,12 @@ } else if (itemEquals(TARGET, item)) { lexer.remove(); Element list = composeTarget(item); - parent.add(list); + if (list != null) { + try { + parent.add(list); + } catch (IllegalAddException e) {} + } else + System.err.println("Unknown target name : \"" + item.attributeValue("id") + "\""); } else if (itemEquals("targetAnonymous", item)) { lexer.remove(); Element list = composeTargetAnonymous(item); @@ -2047,8 +2060,10 @@ * @param Element * e * @throws DocumentException + * @throws UnsupportedEncodingException */ - private void inline(Element e) throws DocumentException { + + private void inline(Element e) throws DocumentException, UnsupportedEncodingException { String text = e.getText(); text = StringEscapeUtils.escapeXml(text); @@ -2251,14 +2266,15 @@ String ref = text.substring(matcher.start(), matcher.end() - 1); ref = ref.replaceAll("('|_)", ""); - ref = ref.replaceAll("[\\W&&[^-]]", " ").trim(); + ref = StringEscapeUtils.unescapeXml(ref); + ref = ref.replaceAll("`", ""); Element hyper = DocumentHelper.createElement("reference"); hyper.addAttribute("name", ref); boolean trouve = false; for (int i = 0; i < eTarget.size() && !trouve; i++) { Element el = eTarget.get(i); - String refTmp = ref.replaceAll("\\s", "-").toLowerCase(); - if (el.attributeValue("id").equalsIgnoreCase(refTmp)) { + String refTmp = URLEncoder.encode(ref.replaceAll("\\s", "-").toLowerCase(), "UTF-8"); + if (el.attributeValue("id").equalsIgnoreCase((refTmp))) { hyper.addAttribute("refuri", el.attributeValue("refuri")); trouve = true; } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-12 17:13:57 UTC (rev 506) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-19 10:17:13 UTC (rev 507) @@ -29,6 +29,8 @@ import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +import java.io.BufferedReader; +import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -104,4 +106,23 @@ "</document>"; Assert.assertEquals(XMLexpected, doc.asXML()); } + + @Test + public void testHyperlinkTarget() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testHyperlinkTarget.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + URL xmlUrl = JRSTReaderTest.class.getResource("/testHyperlinkTarget.xml"); + Reader xmlIn = new InputStreamReader(xmlUrl.openStream()); + BufferedReader reader = new BufferedReader(xmlIn); + String line = null; + StringBuilder stringBuilder = new StringBuilder(); + String ls = System.getProperty("line.separator"); + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + stringBuilder.append(ls); + } + Assert.assertEquals(stringBuilder.toString(), doc.asXML() + "\n"); + } } Added: trunk/jrst/src/test/resources/testHyperlinkTarget.rst =================================================================== --- trunk/jrst/src/test/resources/testHyperlinkTarget.rst (rev 0) +++ trunk/jrst/src/test/resources/testHyperlinkTarget.rst 2010-11-19 10:17:13 UTC (rev 507) @@ -0,0 +1,19 @@ +(External) hyperlinks, like Python_. + +.. _Python: http://www.python.org/ + +(External) hyperlinks, like Pythoné_. + +.. _Pythoné: http://www.python.org/ + +- `Module de depouillement (votecounting)`_ + +.. _Module de depouillement (votecounting): http://www.votecounting.com + +- `Module de depouillement (votecounting)!@#$%&*`_ + +.. _Module de depouillement (votecounting)!@#$%&*: http://www.votecounting.com + +- `Module de dépouillement (votecounting)`_ + +.. _Module de dépouillement (votecounting): votecounting.html Added: trunk/jrst/src/test/resources/testHyperlinkTarget.xml =================================================================== --- trunk/jrst/src/test/resources/testHyperlinkTarget.xml (rev 0) +++ trunk/jrst/src/test/resources/testHyperlinkTarget.xml 2010-11-19 10:17:13 UTC (rev 507) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<document><paragraph>(External) hyperlinks, like <reference name="Python" refuri="http://www.python.org/">Python</reference></paragraph><target id="python" name="python" refuri="http://www.python.org/"/><paragraph>(External) hyperlinks, like <reference name="Pythoné" refuri="http://www.python.org/">Pythoné</reference></paragraph><target id="python%C3%A9" name="pythoné" refuri="http://www.python.org/"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de depouillement (votecounting)" refuri="http://www.votecounting.com">Module de depouillement (votecounting)</reference></paragraph></list_item></bullet_list><target id="module-de-depouillement-%28votecounting%29" name="module de depouillement (votecounting)" refuri="http://www.votecounting.com"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de depouillement (votecounting)!@#$%&*" refuri="http://www.votecounting.com">Module de depouillement (votecounting)!@#$%&*</reference></paragraph></list_item></bullet_list><target id="module-de-depouillement-%28votecounting%29%21%40%23%24%25%26*" name="module de depouillement (votecounting)!@#$%&*" refuri="http://www.votecounting.com"/><bullet_list bullet="-"><list_item><paragraph><reference name="Module de dépouillement (votecounting)" refuri="votecounting.html">Module de dépouillement (votecounting)</reference></paragraph></list_item></bullet_list><target id="module-de-d%C3%A9pouillement-%28votecounting%29" name="module de dépouillement (votecounting)" refuri="votecounting.html"/></document> \ No newline at end of file Property changes on: trunk/jrst/src/test/resources/testHyperlinkTarget.xml ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r506 - in trunk/jrst/src/test: java/org/nuiton/jrst resources
by vbriand＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: vbriand Date: 2010-11-12 18:13:57 +0100 (Fri, 12 Nov 2010) New Revision: 506 Url: http://nuiton.org/repositories/revision/jrst/506 Log: Added a test about external links. Added: trunk/jrst/src/test/resources/testExternalLink.rst Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-12 16:24:27 UTC (rev 505) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2010-11-12 17:13:57 UTC (rev 506) @@ -29,6 +29,7 @@ import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; @@ -89,4 +90,18 @@ "</document>"; Assert.assertEquals(XMLexpected, doc.asXML()); } + + @Test + public void testExternalLink() throws Exception { + URL url = JRSTReaderTest.class.getResource("/testExternalLink.rst"); + Reader in = new InputStreamReader(url.openStream()); + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in); + String XMLexpected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + "<document>" + + "<paragraph>External hyperlinks, like <reference name=\"Python\" refuri=\"http://www.python.org/\">Python</reference></paragraph>" + + "<target id=\"python\" name=\"python\" refuri=\"http://www.python.org/\"/>" + + "</document>"; + Assert.assertEquals(XMLexpected, doc.asXML()); + } } Added: trunk/jrst/src/test/resources/testExternalLink.rst =================================================================== --- trunk/jrst/src/test/resources/testExternalLink.rst (rev 0) +++ trunk/jrst/src/test/resources/testExternalLink.rst 2010-11-12 17:13:57 UTC (rev 506) @@ -0,0 +1,3 @@ +External hyperlinks, like Python_. + +.. _Python: http://www.python.org/

1 0

r505 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst
by vbriand＠users.nuiton.org Nov. 12, 2010

Nov. 12, 2010

Author: vbriand Date: 2010-11-12 17:24:27 +0100 (Fri, 12 Nov 2010) New Revision: 505 Url: http://nuiton.org/repositories/revision/jrst/505 Log: The files ending with \r\n and \r are now managed correctly. The temporary directory used by createTempFile in AdvancedReaderTest.java is now created before the tests so they don't fail anymore. Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-05 10:36:34 UTC (rev 504) +++ trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-12 16:24:27 UTC (rev 505) @@ -93,6 +93,7 @@ protected int readInMark; + protected boolean nlTwoCtrlChars = false; protected boolean noNlAtEOF = false; /** @@ -198,11 +199,11 @@ */ public int unread(int number) { int result = Math.min(number, nextChar); + nextChar -= result; - charNumber -= result; for (int i = nextChar; i < nextChar + result; i++) { - if (buffer.get(i) == '\n') { + if (buffer.get(i) == '\n' || (buffer.get(i) == '\r' && i + 1 < nextChar + result && buffer.get(i + 1) != '\n')) { lineNumber--; } } @@ -220,7 +221,7 @@ * @return number of unread char */ public int unread(String line, boolean addNewLine) { - int result = unread(line.length() + (addNewLine ? 1 : 0)); + int result = unread(line.length() + (addNewLine ? (nlTwoCtrlChars ? 2 : 1) : 0)); return result; } @@ -254,7 +255,7 @@ if (nextChar < buffer.size()) { result = buffer.get(nextChar++); charNumber++; - if (result == '\n') { + if ((char)result == '\n' || ((char)result == '\r' && nextChar < buffer.size() && buffer.get(nextChar) != '\n')) { lineNumber++; } } @@ -270,10 +271,19 @@ public String readLine() throws IOException { StringBuffer result = new StringBuffer(READ_AHEAD); int c = read(); - while (c != -1 && c != '\n') { + while (c != -1 && c != '\n' && c != '\r') { result.append((char) c); c = read(); } + nlTwoCtrlChars = false; + if (c == '\r') { + c = read(); + if (c != '\n' && c != -1) { + unread(1); + } else { + nlTwoCtrlChars = true; + } + } noNlAtEOF = false; if (c == -1 && result.length() >= 0) { if (c == -1 && result.length() == 0) { @@ -356,7 +366,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? (nlTwoCtrlChars ? 2 : 1) : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } @@ -376,7 +386,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? (nlTwoCtrlChars ? 2 : 1) : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2010-11-05 10:36:34 UTC (rev 504) +++ trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2010-11-12 16:24:27 UTC (rev 505) @@ -35,6 +35,7 @@ import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -57,6 +58,15 @@ + "9 toto tata tutu\n"; protected File file; + + /** + * Creates the temporary directory used by createTempFile + */ + @BeforeClass + static public void createTmpDir() { + File tmp = new File(System.getProperty("java.io.tmpdir")); + tmp.mkdirs(); + } /** * setUp - create test file. @@ -64,12 +74,12 @@ */ @Before public void setUp() throws IOException { - file = File.createTempFile("test-AdvancedReader", ".txt"); - file.deleteOnExit(); + file = File.createTempFile("test-AdvancedReader", ".txt"); + file.deleteOnExit(); - Writer out = new BufferedWriter(new FileWriter(file)); - out.write(text); - out.close(); + Writer out = new BufferedWriter(new FileWriter(file)); + out.write(text); + out.close(); } /** @@ -297,5 +307,19 @@ line = in.readLine(); Assert.assertNull(line); } - + + @Test + public void testEol() throws IOException { + String tmp = text; + AdvancedReader in = new AdvancedReader(new StringReader(tmp)); + String[] linesN = in.readAll(); + tmp = tmp.replace('\n', '\r'); + in = new AdvancedReader(new StringReader(tmp)); + String[] linesR = in.readAll(); + tmp = tmp.replaceAll("\r", "\r\n"); + in = new AdvancedReader(new StringReader(tmp)); + String[] linesRN = in.readAll(); + Assert.assertArrayEquals(linesN, linesR); + Assert.assertArrayEquals(linesN, linesRN); + } }

1 0

r504 - in trunk/jrst/src: main/java/org/nuiton/jrst test/java/org/nuiton/jrst/bugs
by vbriand＠users.nuiton.org Nov. 5, 2010

Nov. 5, 2010

Author: vbriand Date: 2010-11-05 11:36:34 +0100 (Fri, 05 Nov 2010) New Revision: 504 Url: http://nuiton.org/repositories/revision/jrst/504 Log: There is no infinite loop anymore when the file doesn't end with a \n (backslash n) Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java Modified: trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-04 15:55:25 UTC (rev 503) +++ trunk/jrst/src/main/java/org/nuiton/jrst/AdvancedReader.java 2010-11-05 10:36:34 UTC (rev 504) @@ -92,6 +92,8 @@ protected int markChar; protected int readInMark; + + protected boolean noNlAtEOF = false; /** * @@ -154,7 +156,7 @@ } /** - * ensure that have number char available and not allready read + * ensure that have number char available and not already read * * @param number ? * @throws IOException @@ -164,8 +166,10 @@ if (needed > 0) { char[] cbuf = new char[needed + READ_AHEAD]; int read = in.read(cbuf); - for (int i = 0; i < read; i++) { - buffer.add(cbuf[i]); + if (read != -1) { + for (int i = 0; i < read; i++) { + buffer.add(cbuf[i]); + } } } } @@ -241,7 +245,7 @@ /** * read one char in buffer * - * @return the next car + * @return the next char * @throws IOException pour tout pb de lecture */ public int read() throws IOException { @@ -270,8 +274,14 @@ result.append((char) c); c = read(); } - if (c == -1 && result.length() == 0) { - return null; + noNlAtEOF = false; + if (c == -1 && result.length() >= 0) { + if (c == -1 && result.length() == 0) { + return null; + } else { + noNlAtEOF = true; + return result.toString(); + } } else { return result.toString(); } @@ -346,7 +356,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + 1); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } @@ -366,7 +376,7 @@ tmp = readLine(); } if (tmp != null) { - unread(tmp.length() + 1); // +1 for '\n' not in line + unread(tmp.length() + (!noNlAtEOF ? 1 : 0)); // +1 for '\n' not in line } return result.toArray(new String[result.size()]); } Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2010-11-04 15:55:25 UTC (rev 503) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2010-11-05 10:36:34 UTC (rev 504) @@ -52,9 +52,8 @@ * plus de 5s. (bug #697). * * @throws Exception if any - * //FIXME tchemit 2010-10-06 Remove Ignore when workaround will be proposed */ - @Ignore + @Test(timeout = 5000) public void testInfiniteLoop() throws Exception { URL url = JRSTReaderTest.class.getResource("/bugs/infiniteLoop.rst");

1 0