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

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

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

07 Feb '11

Author: echatellier Date: 2011-02-07 17:27:04 +0100 (Mon, 07 Feb 2011) New Revision: 519 Url: http://nuiton.org/repositories/revision/jrst/519 Log: rename docutils executable Modified: trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2011-02-07 16:04:02 UTC (rev 518) +++ trunk/jrst/src/test/java/org/nuiton/jrst/Compare.java 2011-02-07 16:27:04 UTC (rev 519) @@ -85,7 +85,7 @@ Reader in = new InputStreamReader(url.openStream()); JRSTReader jrst = new JRSTReader(); Document docRst = jrst.read(in); // JRST - String cmd = "rst2xml " + source.getPath(); + String cmd = "rst2xml.py " + source.getPath(); Process p = null; try { p = Runtime.getRuntime().exec(cmd); // Python

1 0

r518 - trunk/jrst-doc
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 17:04:02 +0100 (Mon, 07 Feb 2011) New Revision: 518 Url: http://nuiton.org/repositories/revision/jrst/518 Log: svn:ignore Modified: trunk/jrst-doc/ Property changes on: trunk/jrst-doc ___________________________________________________________________ Modified: svn:ignore - target nbactions.xml *.iml + target nbactions.xml *.iml .settings .project

1 0

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

07 Feb '11

Author: echatellier Date: 2011-02-07 17:02:02 +0100 (Mon, 07 Feb 2011) New Revision: 517 Url: http://nuiton.org/repositories/revision/jrst/517 Log: #33 : sh/bat launch scripts have been removed from the distribution archive Added: trunk/jrst/src/main/assembly/jrst.bat trunk/jrst/src/main/assembly/jrst.sh 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 15:53:52 UTC (rev 516) +++ trunk/jrst/src/main/assembly/deps.xml 2011-02-07 16:02:02 UTC (rev 517) @@ -59,6 +59,16 @@ </includes> </fileSet> <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory /> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>jrst.sh</include> + <include>jrst.sh</include> + </includes> + </fileSet> + <fileSet> <outputDirectory>/</outputDirectory> <directory>target/classes</directory> <includes> Modified: trunk/jrst/src/main/assembly/full.xml =================================================================== --- trunk/jrst/src/main/assembly/full.xml 2011-02-07 15:53:52 UTC (rev 516) +++ trunk/jrst/src/main/assembly/full.xml 2011-02-07 16:02:02 UTC (rev 517) @@ -64,6 +64,16 @@ </includes> </fileSet> <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory /> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>jrst.sh</include> + <include>jrst.sh</include> + </includes> + </fileSet> + <fileSet> <directory>src</directory>  </fileSet> Added: trunk/jrst/src/main/assembly/jrst.bat =================================================================== --- trunk/jrst/src/main/assembly/jrst.bat (rev 0) +++ trunk/jrst/src/main/assembly/jrst.bat 2011-02-07 16:02:02 UTC (rev 517) @@ -0,0 +1 @@ +java -jar ${project.build.finalName}.${project.packaging} \ No newline at end of file Added: trunk/jrst/src/main/assembly/jrst.sh =================================================================== --- trunk/jrst/src/main/assembly/jrst.sh (rev 0) +++ trunk/jrst/src/main/assembly/jrst.sh 2011-02-07 16:02:02 UTC (rev 517) @@ -0,0 +1,9 @@ +#!/bin/sh +MX=512M +cd `dirname $0` +if [ -n "$JAVA_HOME" ]; then + $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar ${project.build.finalName}.${project.packaging} $* +else + java -Xmx$MX -Xms$MX -jar ${project.build.finalName}.${project.packaging} $* +fi +cd "$OLDPWD" Property changes on: trunk/jrst/src/main/assembly/jrst.sh ___________________________________________________________________ Added: svn:executable + *

1 0

r516 - trunk/jrst
by echatellier＠users.nuiton.org 07 Feb '11

07 Feb '11

Author: echatellier Date: 2011-02-07 16:53:52 +0100 (Mon, 07 Feb 2011) New Revision: 516 Url: http://nuiton.org/repositories/revision/jrst/516 Log: log4j is runtime scope Modified: trunk/jrst/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2011-01-27 08:53:35 UTC (rev 515) +++ trunk/jrst/pom.xml 2011-02-07 15:53:52 UTC (rev 516) @@ -136,7 +136,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies>

1 0