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

r535 - trunk
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 18:16:27 +0100 (Tue, 08 Feb 2011) New Revision: 535 Url: http://nuiton.org/repositories/revision/jrst/535 Log: Update xml unit Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-08 17:13:48 UTC (rev 534) +++ trunk/pom.xml 2011-02-08 17:16:27 UTC (rev 535) @@ -155,7 +155,7 @@ <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> - <version>1.2</version> + <version>1.3</version> <scope>test</scope> </dependency>

1 0

r534 - trunk/jrst/src/test/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 18:13:48 +0100 (Tue, 08 Feb 2011) New Revision: 534 Url: http://nuiton.org/repositories/revision/jrst/534 Log: Format Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2011-02-08 17:11:51 UTC (rev 533) +++ trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2011-02-08 17:13:48 UTC (rev 534) @@ -64,22 +64,22 @@ */ @BeforeClass static public void createTmpDir() { - File tmp = new File(System.getProperty("java.io.tmpdir")); + File tmp = new File(System.getProperty("java.io.tmpdir")); tmp.mkdirs(); } - + /** * setUp - create test file. * @throws IOException */ @Before public void setUp() throws IOException { - file = File.createTempFile("test-AdvancedReader", ".txt"); - file.deleteOnExit(); - - Writer out = new BufferedWriter(new FileWriter(file)); - out.write(text); - out.close(); + file = File.createTempFile("test-AdvancedReader", ".txt"); + file.deleteOnExit(); + + Writer out = new BufferedWriter(new FileWriter(file)); + out.write(text); + out.close(); } /** @@ -315,16 +315,16 @@ */ @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); + 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

r533 - trunk/jrst/src/test/java/org/nuiton/jrst
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 18:11:51 +0100 (Tue, 08 Feb 2011) New Revision: 533 Url: http://nuiton.org/repositories/revision/jrst/533 Log: Format and add doc Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2011-02-08 17:08:28 UTC (rev 532) +++ trunk/jrst/src/test/java/org/nuiton/jrst/AdvancedReaderTest.java 2011-02-08 17:11:51 UTC (rev 533) @@ -307,19 +307,24 @@ line = in.readLine(); Assert.assertNull(line); } - + + /** + * Test que les caracteres de fin de ligne \n et \r\n sont bien gérés. + * + * @throws IOException + */ @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); + 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

r532 - in trunk/jrst/src/test: java/org/nuiton/jrst/bugs resources/bugs
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 18:08:28 +0100 (Tue, 08 Feb 2011) New Revision: 532 Url: http://nuiton.org/repositories/revision/jrst/532 Log: Add test about #274:Rst file parsing fails with no level 2 subtitle Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java 2011-02-08 17:08:28 UTC (rev 532) @@ -0,0 +1,56 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.jrst.bugs; + +import java.io.File; + +import org.junit.Test; +import org.nuiton.jrst.JRST; + +/** + * Test concernant les titres en général. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TitlesTest { + + /** + * Test que la génération fonctionne meme s'il n'y a pas de titre + * de niveau 2. + * @throws Exception + */ + @Test + public void testNoSubtitle() throws Exception { + File in = new File("src/test/resources/bugs/testNoSubtitle.rst"); + File out = File.createTempFile("jrst-RstToHtml2", ".html"); + out.deleteOnExit(); + JRST.generate(JRST.TYPE_HTML, in, out, JRST.Overwrite.ALLTIME); + } +} Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/TitlesTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/testNoSubtitle.rst 2011-02-08 17:08:28 UTC (rev 532) @@ -0,0 +1,19 @@ +============== +ECMAScriptEdit +============== + +:Author: Benjamin Poussin <poussin(a)codelutin.com> +:Revision: $Revision: 1545 $ +:Date: $Date: 2008-10-08 16:13:44 +0200 (mer 08 oct 2008) $ + +.. sectnum:: + +.. contents:: + +L'editeur d'ECMAScript permet d'influer sur la façon dont isis-fish simule. +Une partie du simulateur est écrit grâce à cette interface, il suffit de +modifier ce code pour modifier la façon de simuler. Le code qui n'est pas +directement écrit en ECMAScript devra être réécrit pour modifier cette +partie du simulation. Cette partie du simulateur n'est pas écrite en +ECMAScript pour des raisons de performance, car des optimisations sont faite +lors de la compilation du code, et pour des raisons de débuggage.

1 0

r531 - in trunk: . doxia-module-jrst jrst jrst-doc
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 17:32:55 +0100 (Tue, 08 Feb 2011) New Revision: 531 Url: http://nuiton.org/repositories/revision/jrst/531 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-02-08 16:32:53 UTC (rev 530) +++ trunk/doxia-module-jrst/pom.xml 2011-02-08 16:32:55 UTC (rev 531) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-02-08 16:32:53 UTC (rev 530) +++ trunk/jrst/pom.xml 2011-02-08 16:32:55 UTC (rev 531) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-02-08 16:32:53 UTC (rev 530) +++ trunk/jrst-doc/pom.xml 2011-02-08 16:32:55 UTC (rev 531) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2</version> + <version>1.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-08 16:32:53 UTC (rev 530) +++ trunk/pom.xml 2011-02-08 16:32:55 UTC (rev 531) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.2</version> + <version>1.2.1-SNAPSHOT</version> <modules> <module>jrst</module> @@ -380,11 +380,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.2</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.2 + scm:svn:http://svn.nuiton.org/svn/jrst/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.2</url> + <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> <profiles>

1 0

r530 - tags
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 17:32:53 +0100 (Tue, 08 Feb 2011) New Revision: 530 Url: http://nuiton.org/repositories/revision/jrst/530 Log: [maven-release-plugin] copy for tag jrst-1.2 Added: tags/jrst-1.2/

1 0

r529 - in trunk: . doxia-module-jrst jrst jrst-doc
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 17:32:51 +0100 (Tue, 08 Feb 2011) New Revision: 529 Url: http://nuiton.org/repositories/revision/jrst/529 Log: [maven-release-plugin] prepare release jrst-1.2 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/pom.xml Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2011-02-08 16:28:48 UTC (rev 528) +++ trunk/doxia-module-jrst/pom.xml 2011-02-08 16:32:51 UTC (rev 529) @@ -24,9 +24,7 @@ #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> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-02-08 16:28:48 UTC (rev 528) +++ trunk/jrst/pom.xml 2011-02-08 16:32:51 UTC (rev 529) @@ -24,9 +24,7 @@ #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> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2011-02-08 16:28:48 UTC (rev 528) +++ trunk/jrst-doc/pom.xml 2011-02-08 16:32:51 UTC (rev 529) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-08 16:28:48 UTC (rev 528) +++ trunk/pom.xml 2011-02-08 16:32:51 UTC (rev 529) @@ -37,7 +37,7 @@ </parent> <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <modules> <module>jrst</module> @@ -380,11 +380,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.2</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/trunk + scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-1.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-1.2</url> </scm> <profiles>

1 0

r528 - trunk/doxia-module-jrst/src/license
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 17:28:48 +0100 (Tue, 08 Feb 2011) New Revision: 528 Url: http://nuiton.org/repositories/revision/jrst/528 Log: Update thrid party file Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties Modified: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2011-02-08 08:40:31 UTC (rev 527) +++ trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2011-02-08 16:28:48 UTC (rev 528) @@ -17,9 +17,8 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 22 16:42:48 CET 2010 +#Mon Feb 07 18:03:31 CET 2011 com.ibm.icu--icu4j--2.6.1--jar=X License (http\://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.html) -commons-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

1 0

r527 - trunk
by echatellier＠users.nuiton.org 08 Feb '11

08 Feb '11

Author: echatellier Date: 2011-02-08 09:40:31 +0100 (Tue, 08 Feb 2011) New Revision: 527 Url: http://nuiton.org/repositories/revision/jrst/527 Log: Update deps Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 17:36:13 UTC (rev 526) +++ trunk/pom.xml 2011-02-08 08:40:31 UTC (rev 527) @@ -353,7 +353,7 @@ <doxiaVersion>1.1.4</doxiaVersion> <nuitonUtilsVersion>2.0</nuitonUtilsVersion> - <nuitonI18nVersion>2.2</nuitonI18nVersion> + <nuitonI18nVersion>2.3</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> </properties>

1 0

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

07 Feb '11

Author: echatellier Date: 2011-02-07 18:36:13 +0100 (Mon, 07 Feb 2011) New Revision: 526 Url: http://nuiton.org/repositories/revision/jrst/526 Log: Imports 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/Compare.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 2011-02-07 17:15:16 UTC (rev 525) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTLexer.java 2011-02-07 17:36:13 UTC (rev 526) @@ -33,11 +33,9 @@ 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; Modified: trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-02-07 17:15:16 UTC (rev 525) +++ trunk/jrst/src/main/java/org/nuiton/jrst/JRSTReader.java 2011-02-07 17:36:13 UTC (rev 526) @@ -124,7 +124,6 @@ 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; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2011-02-07 17:15:16 UTC (rev 525) +++ trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2011-02-07 17:36:13 UTC (rev 526) @@ -23,7 +23,6 @@ * #L% */ - package org.nuiton.jrst; import java.io.File; Modified: trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-02-07 17:15:16 UTC (rev 525) +++ trunk/jrst/src/test/java/org/nuiton/jrst/JRSTReaderTest.java 2011-02-07 17:36:13 UTC (rev 526) @@ -28,12 +28,8 @@ 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; import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; @@ -41,7 +37,6 @@ import junit.framework.Assert; import org.junit.Test; -import org.nuiton.util.FileUtil; /** * JRSTReaderTest.

1 0