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

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

r525 - trunk/jrst/src/main/resources/xsl
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 18:15:16 +0100 (Mon, 07 Feb 2011) New Revision: 525 Url: http://nuiton.org/repositories/revision/jrst/525 Log: Remove license Modified: trunk/jrst/src/main/resources/xsl/xml2rst.xsl Modified: trunk/jrst/src/main/resources/xsl/xml2rst.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/xml2rst.xsl 2011-02-07 17:06:27 UTC (rev 524) +++ trunk/jrst/src/main/resources/xsl/xml2rst.xsl 2011-02-07 17:15:16 UTC (rev 525) @@ -1,29 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> - - <!DOCTYPE xsl:stylesheet [ <!ENTITY CR "
">  @@ -33,7 +8,7 @@ <!ENTITY tSP "<xsl:text> </xsl:text>"> ]> -<!-- +<!-- %%Ignore-License Copyright (C) 2005, 2006 Stefan Merten, David Priest xml2rst.xsl is free software; you can redistribute it and/or modify

1 0

r524 - trunk/jrst/src/main/assembly
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 18:06:27 +0100 (Mon, 07 Feb 2011) New Revision: 524 Url: http://nuiton.org/repositories/revision/jrst/524 Log: Fix assemblies Modified: trunk/jrst/src/main/assembly/deps.xml trunk/jrst/src/main/assembly/full.xml Modified: trunk/jrst/src/main/assembly/deps.xml =================================================================== --- trunk/jrst/src/main/assembly/deps.xml 2011-02-07 17:03:11 UTC (rev 523) +++ trunk/jrst/src/main/assembly/deps.xml 2011-02-07 17:06:27 UTC (rev 524) @@ -64,8 +64,8 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> + <include>jrst.bat</include> <include>jrst.sh</include> - <include>jrst.sh</include> </includes> </fileSet> <fileSet> Modified: trunk/jrst/src/main/assembly/full.xml =================================================================== --- trunk/jrst/src/main/assembly/full.xml 2011-02-07 17:03:11 UTC (rev 523) +++ trunk/jrst/src/main/assembly/full.xml 2011-02-07 17:06:27 UTC (rev 524) @@ -69,8 +69,8 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> + <include>jrst.bat</include> <include>jrst.sh</include> - <include>jrst.sh</include> </includes> </fileSet> <fileSet>

1 0

r523 - trunk
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 18:03:11 +0100 (Mon, 07 Feb 2011) New Revision: 523 Url: http://nuiton.org/repositories/revision/jrst/523 Log: Update deps Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 16:59:19 UTC (rev 522) +++ trunk/pom.xml 2011-02-07 17:03:11 UTC (rev 523) @@ -351,9 +351,9 @@ <siteSourcesType>apt</siteSourcesType> - <doxiaVersion>1.1.3</doxiaVersion> - <nuitonUtilsVersion>1.4.1</nuitonUtilsVersion> - <nuitonI18nVersion>2.0</nuitonI18nVersion> + <doxiaVersion>1.1.4</doxiaVersion> + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <nuitonI18nVersion>2.2</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> </properties>

1 0

r522 - in trunk/jrst: . src/main/assembly
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 17:59:19 +0100 (Mon, 07 Feb 2011) New Revision: 522 Url: http://nuiton.org/repositories/revision/jrst/522 Log: Fix assemblies Modified: trunk/jrst/pom.xml trunk/jrst/src/main/assembly/jrst.sh Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-02-07 16:57:43 UTC (rev 521) +++ trunk/jrst/pom.xml 2011-02-07 16:59:19 UTC (rev 522) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 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 @@ -252,7 +252,7 @@  <profiles> -  +  <profile> <id>release-assembly-profile</id> <activation> @@ -264,9 +264,10 @@ <build> <plugins> -  +  <plugin> <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> <executions> <execution> <id>create-assemblies</id> @@ -278,10 +279,10 @@ </executions> <configuration> <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> </configuration> </plugin> Modified: trunk/jrst/src/main/assembly/jrst.sh =================================================================== --- trunk/jrst/src/main/assembly/jrst.sh 2011-02-07 16:57:43 UTC (rev 521) +++ trunk/jrst/src/main/assembly/jrst.sh 2011-02-07 16:59:19 UTC (rev 522) @@ -1,3 +1,27 @@ +### +# #%L +# JRst :: Api +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 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% +### #!/bin/sh MX=512M cd `dirname $0`

1 0

r521 - trunk/jrst/src/main/resources/xsl
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 17:57:43 +0100 (Mon, 07 Feb 2011) New Revision: 521 Url: http://nuiton.org/repositories/revision/jrst/521 Log: #563 : All the titles are generated as level 2 in html output Modified: trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl Modified: trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl =================================================================== --- trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl 2011-02-07 16:29:57 UTC (rev 520) +++ trunk/jrst/src/main/resources/xsl/rst2xdoc.xsl 2011-02-07 16:57:43 UTC (rev 521) @@ -37,10 +37,7 @@ <title><xsl:value-of select="title"/></title> </properties> <body> - <section> - <xsl:attribute name="name"><xsl:value-of select="title"/></xsl:attribute> - <xsl:apply-templates /> - </section> + <xsl:apply-templates /> </body> </document> </xsl:template> @@ -48,9 +45,17 @@ <xsl:template match="title"> <xsl:choose> <xsl:when test="count(ancestor::section) = 0"> + <section> + <xsl:attribute name="name"><xsl:value-of select="."/></xsl:attribute> + </section> </xsl:when> + <xsl:when test="count(ancestor::section) = 1"> + <subsection> + <xsl:attribute name="name"><xsl:value-of select="."/></xsl:attribute> + </subsection> + </xsl:when> <xsl:otherwise> - <xsl:element name="h{count(ancestor::section) + 1}"> + <xsl:element name="h{count(ancestor::section) + 2}"> <xsl:apply-templates/> </xsl:element> </xsl:otherwise>

1 0

r520 - trunk/jrst/src/test/java/org/nuiton/jrst/bugs
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 17:29:57 +0100 (Mon, 07 Feb 2011) New Revision: 520 Url: http://nuiton.org/repositories/revision/jrst/520 Log: Fix import Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2011-02-07 16:27:04 UTC (rev 519) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2011-02-07 16:29:57 UTC (rev 520) @@ -27,7 +27,6 @@ import org.dom4j.Document; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.jrst.JRSTReader; import org.nuiton.jrst.JRSTReaderTest; @@ -53,7 +52,6 @@ * * @throws Exception if any */ - @Test(timeout = 5000) public void testInfiniteLoop() throws Exception { URL url = JRSTReaderTest.class.getResource("/bugs/infiniteLoop.rst");

1 0