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

r286 - jrst/trunk/src/main/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org 27 Feb '09

27 Feb '09

Author: chatellier Date: 2009-02-27 18:57:36 +0000 (Fri, 27 Feb 2009) New Revision: 286 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java Log: Undo previous commit (test infinite loop) Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-27 17:58:49 UTC (rev 285) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-27 18:57:36 UTC (rev 286) @@ -259,7 +259,11 @@ in.unread(firstLine, true); int level = level(firstLine); if (level >= minLeftMargin) { - result = in.readWhile("^\\S{" + level + "}.*"); + + // FIXME should be somethings like that: + // result = in.readWhile("^\\S{" + level + "}.*"); + // but tests fail + result = in.readWhile("^ {" + level + "}\\S+.*"); } }

1 0

r285 - jrst/trunk/src/test/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org 27 Feb '09

27 Feb '09

Author: chatellier Date: 2009-02-27 17:58:49 +0000 (Fri, 27 Feb 2009) New Revision: 285 Modified: jrst/trunk/src/test/java/org/codelutin/jrst/Compare.java jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java jrst/trunk/src/test/java/org/codelutin/jrst/ThreadRedirection.java Log: Update test, use StringBuffer to read docutils process output. Modified: jrst/trunk/src/test/java/org/codelutin/jrst/Compare.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/Compare.java 2009-02-27 17:57:27 UTC (rev 284) +++ jrst/trunk/src/test/java/org/codelutin/jrst/Compare.java 2009-02-27 17:58:49 UTC (rev 285) @@ -74,11 +74,10 @@ ThreadRedirection t = new ThreadRedirection(p); t.start(); p.waitFor(); // On attend que le processus ce termine - //String strPython = t.getSortit().replaceAll("null", ""); t.stop(); p.destroy(); SAXReader sr = new SAXReader(); - Document docPython = sr.read(new StringReader(t.getSortit())); + Document docPython = sr.read(new StringReader(t.getOutput())); String diff = test(docRst, docPython); String sDocRst = indent(docRst); // On indente String sDocPython = indent(docPython); Modified: jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java 2009-02-27 17:57:27 UTC (rev 284) +++ jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java 2009-02-27 17:58:49 UTC (rev 285) @@ -147,7 +147,7 @@ test1.delete(); } - @Ignore + @Test public void testRstToPDF() throws Exception { if (log.isInfoEnabled()) { Modified: jrst/trunk/src/test/java/org/codelutin/jrst/ThreadRedirection.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/ThreadRedirection.java 2009-02-27 17:57:27 UTC (rev 284) +++ jrst/trunk/src/test/java/org/codelutin/jrst/ThreadRedirection.java 2009-02-27 17:58:49 UTC (rev 285) @@ -26,60 +26,33 @@ * Class qui redirige la sortie standard pour la laisser en interne */ public class ThreadRedirection extends Thread { - String str; - String errors; - Process process; + protected StringBuffer str; + protected Process process; public ThreadRedirection(Process p) { process = p; + str = new StringBuffer(); } public void run() { try { BufferedReader reader = new BufferedReader(new InputStreamReader( process.getInputStream())); - BufferedReader readerErrors = new BufferedReader( - new InputStreamReader(process.getErrorStream())); try { String line; while ((line = reader.readLine()) != null) { - if (!line.equals("null")) { - str += "\n" + line; - } + str.append(line + "\n"); } } finally { reader.close(); } - try { - String line; - while ((line = readerErrors.readLine()) != null) { - if (!line.equals(null)) { - errors += "\n" + line; - } - } - - } finally { - reader.close(); - } } catch (IOException ioe) { ioe.printStackTrace(); } } - public String getSortit() { - - String result = ""; - for (String l : str.split("\n")) - if (!l.equals("null")) { - result += l + "\n"; - } - - return result; + public String getOutput() { + return str.toString(); } - - public String getErrors() { - return errors; - } - }

1 0

r284 - jrst/trunk/src/main/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org 27 Feb '09

27 Feb '09

Author: chatellier Date: 2009-02-27 17:57:27 +0000 (Fri, 27 Feb 2009) New Revision: 284 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java Log: Fix readBlock to read level spaces and not level +1 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-27 08:52:39 UTC (rev 283) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-27 17:57:27 UTC (rev 284) @@ -259,7 +259,7 @@ in.unread(firstLine, true); int level = level(firstLine); if (level >= minLeftMargin) { - result = in.readWhile("^ {" + level + "}\\S+.*"); + result = in.readWhile("^\\S{" + level + "}.*"); } }

1 0

r283 - in jrst/trunk/src: main/java/org/codelutin/jrst test/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org 27 Feb '09

27 Feb '09

Author: chatellier Date: 2009-02-27 08:52:39 +0000 (Fri, 27 Feb 2009) New Revision: 283 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java Log: Parse comment after footnote directive. Fix test. Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-27 08:17:59 UTC (rev 282) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-27 08:52:39 UTC (rev 283) @@ -480,11 +480,7 @@ if (result == null) { result = peekDirectiveOrReference(); } - // comment must be read after peekDirectiveOrReference() if (result == null) { - result = peekComment(); - } - if (result == null) { result = peekTransition(); } if (result == null) { @@ -508,7 +504,12 @@ if (result == null) { result = peekFootnote(); } + // comment must be read after peekDirectiveOrReference() + // and peekFootnote() if (result == null) { + result = peekComment(); + } + if (result == null) { result = peekDefinitionList(); } if (result == null) { Modified: jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java =================================================================== --- jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java 2009-02-27 08:17:59 UTC (rev 282) +++ jrst/trunk/src/test/java/org/codelutin/jrst/JRSTGeneratorTest.java 2009-02-27 08:52:39 UTC (rev 283) @@ -19,6 +19,8 @@ import java.io.File; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; @@ -35,16 +37,28 @@ */ public class JRSTGeneratorTest { + /** to use log facility, just put in your code: log.info("..."); */ + protected static Log log = LogFactory.getLog(JRSTGeneratorTest.class); + @Test - public void testRstToHtml() throws Exception { + public void testRstToRst() throws Exception { - File test1 = File.createTempFile("jrst-RstToHtml", ".html"); + if (log.isInfoEnabled()) { + log.info("Testing RST to RST (test.rst)..."); + } + + File test1 = File.createTempFile("jrst-RstToRst", ".rst"); JRST.main(new String[] { "-t", "rst", "--force", "-o", test1.getAbsolutePath(), "src/test/resources/test.rst", }); test1.delete(); } @Test - public void testRstToHtml2() throws Exception { + public void testRstToHtml() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Testing RST to HTML (test.rst)..."); + } + File test1 = File.createTempFile("jrst-RstToHtml2", ".html"); JRST.main(new String[] { "-t", "html", "--force", "-o", test1.getAbsolutePath(), "src/test/resources/text.rst" }); test1.delete(); @@ -53,6 +67,10 @@ @Test public void testRstToDocbook() throws Exception { + if (log.isInfoEnabled()) { + log.info("Testing RST to Docbook (test.rst)..."); + } + File test1 = File.createTempFile("jrst-RstToDocbook", ".dbk"); JRST.main(new String[]{"-t", "docbook", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test.rst"}); @@ -61,10 +79,15 @@ @Test public void testRstToXdoc() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Testing RST to Xdoc (test.rst)..."); + } + File test1 = File.createTempFile("jrst-RstToXdoc", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test.rst" }); - //test1.delete(); + test1.delete(); } /** @@ -74,6 +97,11 @@ */ @Ignore public void testRstToXdoc2() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Testing RST to Xdoc (test2.rst)..."); + } + File test1 = File.createTempFile("jrst-RstToXdoc2", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test2.rst" }); @@ -82,6 +110,11 @@ @Test public void testRstToXdoc3() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Testing RST to Xdoc (test3.rst) ..."); + } + File test1 = File.createTempFile("jrst-RstToXdoc3", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test3.rst" }); @@ -90,6 +123,11 @@ @Test public void testRstToXdoc4() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Testing RST to Xdoc (test4.rst) ..."); + } + File test1 = File.createTempFile("jrst-RstToXdoc4", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/test4.rst" }); @@ -98,9 +136,27 @@ @Test public void testRstToXdocJrstSite() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Testing RST to Xdoc (frEntier.rst) ..."); + } + File test1 = File.createTempFile("jrst-RstToXdocJrstSite", ".xdoc"); JRST.main(new String[] { "-t", "xdoc", "--force","-o", test1.getAbsolutePath(), "src/test/resources/frEntier.rst" }); test1.delete(); } + + @Ignore + public void testRstToPDF() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Testing RST to PDF (frEntier.rst) ..."); + } + + File test1 = File.createTempFile("jrst-RstToPDF", ".pdf"); + JRST.main(new String[] { "-t", "pdf", "--force","-o", test1.getAbsolutePath(), + "src/test/resources/frEntier.rst" }); + test1.delete(); + } }

1 0

r282 - in jrst/trunk/src/main: java/org/codelutin/jrst resources/xsl
by chatellier＠users.labs.libre-entreprise.org 27 Feb '09

27 Feb '09

Author: chatellier Date: 2009-02-27 08:17:59 +0000 (Fri, 27 Feb 2009) New Revision: 282 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl Log: Fix comment directive and trailing spaces Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-23 08:48:45 UTC (rev 281) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-27 08:17:59 UTC (rev 282) @@ -463,9 +463,6 @@ result = peekInclude(); } if (result == null) { - result = peekComment(); - } - if (result == null) { result = peekDoctestBlock(); } if (result == null) { @@ -483,7 +480,11 @@ if (result == null) { result = peekDirectiveOrReference(); } + // comment must be read after peekDirectiveOrReference() if (result == null) { + result = peekComment(); + } + if (result == null) { result = peekTransition(); } if (result == null) { @@ -1936,11 +1937,11 @@ } else { String title = in.readLine(); if (title != null && startsWithTitleChar(title) - && line.length() == title.length()) { + && line.replaceFirst("\\s*$", "").length() == title.length()) { result = DocumentHelper.createElement(TITLE).addAttribute( "type", "simple").addAttribute("char", - title.substring(0, 1)).addText(line); + title.substring(0, 1)).addText(line.replaceFirst("\\s*$", "")); } } } @@ -2074,17 +2075,23 @@ Element result = null; String line = in.readLine(); if (line != null) { - if (line.matches("^\\.\\.\\s*$")) { + if (line.matches("^\\.\\.\\s*.*$")) { result = DocumentHelper.createElement("comment"); result.addAttribute("level", "0"); result.addAttribute("xml:space", "preserve"); + + // first line is part of comment + result.setText(line.substring(2).trim() + "\n"); line = in.readLine(); int level = level(line); - String[] lines = readBlock(level); - String text = line.substring(level); - for (String l : lines) - text += "\n" + l.substring(level); - result.setText(text); + if (level > 0) { + String[] lines = readBlock(level); + String text = line.substring(level); + for (String l : lines) { + text += "\n" + l.substring(level); + } + result.addText(text); + } } } Modified: jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl =================================================================== --- jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl 2009-02-23 08:48:45 UTC (rev 281) +++ jrst/trunk/src/main/resources/xsl/rst2xhtml.xsl 2009-02-27 08:17:59 UTC (rev 282) @@ -18,6 +18,12 @@ </html> </xsl:template> + <xsl:template match="comment"> + <xsl:comment> + <xsl:apply-templates/> + </xsl:comment> + </xsl:template> + <xsl:template match="title"> <xsl:if test="name(..)='document'"> <h1 class="mainTitle">

1 0

r281 - jrst/trunk jrst/trunk/src/main/assembly maven-jrst-plugin/trunk maven-jrst-plugin/trunk/src/site
by chatellier＠users.labs.libre-entreprise.org 23 Feb '09

23 Feb '09

Author: chatellier Date: 2009-02-23 08:48:45 +0000 (Mon, 23 Feb 2009) New Revision: 281 Modified: jrst/trunk/pom.xml jrst/trunk/src/main/assembly/deps.xml jrst/trunk/src/main/assembly/full.xml maven-jrst-plugin/trunk/pom.xml maven-jrst-plugin/trunk/src/site/site_en.xml maven-jrst-plugin/trunk/src/site/site_fr.xml Log: Update some version, and add some assembly. Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-02-18 18:46:34 UTC (rev 280) +++ jrst/trunk/pom.xml 2009-02-23 08:48:45 UTC (rev 281) @@ -108,6 +108,40 @@ <i18n.version>0.9</i18n.version> </properties> + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + <role>Debian packager</role> + </roles> + </developer> + <developer> + <name>Eric Chatellier</name> + <id>chatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + <build> <defaultGoal>install</defaultGoal> @@ -158,7 +192,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -181,9 +215,10 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version> <configuration> - <link>http://java.sun.com/javase/6/docs/api/index.html</link> - <link>http://topia.labs.libre-entreprise.org/apidocs/</link> - <link>http://lutinutil.labs.libre-entreprise.org/apidocs/</link> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://lutinutil.labs.libre-entreprise.org/apidocs/</link> + </links> </configuration> </plugin--> </plugins> Modified: jrst/trunk/src/main/assembly/deps.xml =================================================================== --- jrst/trunk/src/main/assembly/deps.xml 2009-02-18 18:46:34 UTC (rev 280) +++ jrst/trunk/src/main/assembly/deps.xml 2009-02-23 08:48:45 UTC (rev 281) @@ -19,9 +19,9 @@  <source>target/${project.build.finalName}.jar</source> </file> - <file> +  </files> <fileSets> <fileSet> Modified: jrst/trunk/src/main/assembly/full.xml =================================================================== --- jrst/trunk/src/main/assembly/full.xml 2009-02-18 18:46:34 UTC (rev 280) +++ jrst/trunk/src/main/assembly/full.xml 2009-02-23 08:48:45 UTC (rev 281) @@ -18,9 +18,9 @@  <source>target/${project.build.finalName}.jar</source> </file> - <file> +  </files> <fileSets> <fileSet> Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:46:34 UTC (rev 280) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-23 08:48:45 UTC (rev 281) @@ -71,7 +71,7 @@ <lutinpluginutil.version>0.3</lutinpluginutil.version> - <maven.version>2.0.9</maven.version> + <maven.version>2.0.10</maven.version> </properties> <build> @@ -97,7 +97,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> Modified: maven-jrst-plugin/trunk/src/site/site_en.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site_en.xml 2009-02-18 18:46:34 UTC (rev 280) +++ maven-jrst-plugin/trunk/src/site/site_en.xml 2009-02-23 08:48:45 UTC (rev 281) @@ -4,7 +4,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.2</version> + <version>0.2.3</version> </skin> <bannerLeft> Modified: maven-jrst-plugin/trunk/src/site/site_fr.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site_fr.xml 2009-02-18 18:46:34 UTC (rev 280) +++ maven-jrst-plugin/trunk/src/site/site_fr.xml 2009-02-23 08:48:45 UTC (rev 281) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.2</version> + <version>0.2.3</version> </skin> <bannerLeft>

1 0

r280 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:46:34 +0000 (Wed, 18 Feb 2009) New Revision: 280 Modified: maven-jrst-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:46:31 UTC (rev 279) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:46:34 UTC (rev 280) @@ -18,7 +18,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>jrst</artifactId> - <version>0.8.4</version> + <version>0.8.5-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -48,7 +48,7 @@   <name>Maven JRST Plugin</name> - <version>0.8.4</version> + <version>0.8.5-SNAPSHOT</version> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> @@ -133,9 +133,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.4</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.4</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> </scm>

1 0

r279 - in maven-jrst-plugin/tags: . 0.8.4
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:46:31 +0000 (Wed, 18 Feb 2009) New Revision: 279 Added: maven-jrst-plugin/tags/0.8.4/ maven-jrst-plugin/tags/0.8.4/changelog.txt maven-jrst-plugin/tags/0.8.4/pom.xml Removed: maven-jrst-plugin/tags/0.8.4/changelog.txt maven-jrst-plugin/tags/0.8.4/pom.xml Log: [maven-release-plugin] copy for tag 0.8.4 Copied: maven-jrst-plugin/tags/0.8.4 (from rev 269, maven-jrst-plugin/trunk) Deleted: maven-jrst-plugin/tags/0.8.4/changelog.txt =================================================================== --- maven-jrst-plugin/trunk/changelog.txt 2009-02-17 17:02:04 UTC (rev 269) +++ maven-jrst-plugin/tags/0.8.4/changelog.txt 2009-02-18 18:46:31 UTC (rev 279) @@ -1,14 +0,0 @@ -ver-0-8-4 chatellier 200902xx - * 20090210 [chemit] use lutinproject-3.4 - * 20090205 Set default locale to 'en' - * 20090205 Remove some required setting for parameter with default values - * 20090205 Write javadoc in english - -ver-0-8-3 thimel 200810XX - * 20081008 [chemit] refactor plugin to generate ony when required - * 20081008 [chemit] Using lutinpluginproject 3.0 in a better way :) - * 20081008 [chemit] add log4j.properties - * 20081008 [chemit] use a DirectoryScanner instead of FileAction since we do not want to parse scm admin files... - -ver-0-8-2 thimel 20080922 - * 20080922 [thimel] Using lutinpluginproject 3.0 Copied: maven-jrst-plugin/tags/0.8.4/changelog.txt (from rev 276, maven-jrst-plugin/trunk/changelog.txt) =================================================================== --- maven-jrst-plugin/tags/0.8.4/changelog.txt (rev 0) +++ maven-jrst-plugin/tags/0.8.4/changelog.txt 2009-02-18 18:46:31 UTC (rev 279) @@ -0,0 +1,14 @@ +ver-0-8-4 chemit 20090218 + * 20090210 [chemit] use lutinproject:3.4 + * 20090205 [chatellier] Set default locale to 'en' + * 20090205 [chatellier] Remove some required setting for parameter with default values + * 20090205 [chatellier] Write javadoc in english + +ver-0-8-3 thimel 200810XX + * 20081008 [chemit] refactor plugin to generate ony when required + * 20081008 [chemit] Using lutinpluginproject 3.0 in a better way :) + * 20081008 [chemit] add log4j.properties + * 20081008 [chemit] use a DirectoryScanner instead of FileAction since we do not want to parse scm admin files... + +ver-0-8-2 thimel 20080922 + * 20080922 [thimel] Using lutinpluginproject 3.0 Deleted: maven-jrst-plugin/tags/0.8.4/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-17 17:02:04 UTC (rev 269) +++ maven-jrst-plugin/tags/0.8.4/pom.xml 2009-02-18 18:46:31 UTC (rev 279) @@ -1,196 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> - </parent> - - <artifactId>maven-jrst-plugin</artifactId> - - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jrst</artifactId> - <version>${jrst.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>0.3-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> - - </dependencies> - -  -  -  - <name>Maven JRST Plugin</name> - <version>0.8.4-SNAPSHOT</version> - <description> - Maven2 plugin to generate reStructuredText file into xDoc. - </description> - <inceptionYear>2006</inceptionYear> - -  -  -  - <packaging>maven-plugin</packaging> - - <properties> -  - <labs.id>54</labs.id> - -  - <labs.project>jrst</labs.project> - -  - <maven.site.locales>fr,en</maven.site.locales> - - <jrst.version>0.8.4-SNAPSHOT</jrst.version> - - <maven.version>2.0.9</maven.version> - </properties> - - <build> - - <defaultGoal>install</defaultGoal> - - <plugins> - -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> - </configuration> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jrst</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - -  - <reporting> - <plugins> -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> - </plugins> - </reporting> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -  - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - -  - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>license</goal> - <goal>third-party</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - </profiles> - -</project> Copied: maven-jrst-plugin/tags/0.8.4/pom.xml (from rev 278, maven-jrst-plugin/trunk/pom.xml) =================================================================== --- maven-jrst-plugin/tags/0.8.4/pom.xml (rev 0) +++ maven-jrst-plugin/tags/0.8.4/pom.xml 2009-02-18 18:46:31 UTC (rev 279) @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.4</version> + </parent> + + <artifactId>maven-jrst-plugin</artifactId> + + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>jrst</artifactId> + <version>0.8.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>${lutinpluginutil.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Maven JRST Plugin</name> + <version>0.8.4</version> + <description> + Maven2 plugin to generate reStructuredText file into xDoc. + </description> + <inceptionYear>2006</inceptionYear> + +  +  +  + <packaging>maven-plugin</packaging> + + <properties> +  + <labs.id>54</labs.id> + +  + <labs.project>jrst</labs.project> + +  + <maven.site.locales>fr,en</maven.site.locales> + + <lutinpluginutil.version>0.3</lutinpluginutil.version> + + <maven.version>2.0.9</maven.version> + </properties> + + <build> + + <defaultGoal>install</defaultGoal> + + <plugins> + +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>0.8.3</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +  + <reporting> + <plugins> +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + </plugin> + </plugins> + </reporting> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.4</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> + </scm> + +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + +  + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.6</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + +</project>

1 0

r278 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:46:28 +0000 (Wed, 18 Feb 2009) New Revision: 278 Modified: maven-jrst-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.8.4 Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:44:56 UTC (rev 277) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:46:28 UTC (rev 278) @@ -18,7 +18,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>jrst</artifactId> - <version>${project.version}</version> + <version>0.8.4</version> <scope>compile</scope> </dependency> <dependency> @@ -48,7 +48,7 @@   <name>Maven JRST Plugin</name> - <version>0.8.4-SNAPSHOT</version> + <version>0.8.4</version> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> @@ -133,9 +133,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.4</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/maven-jrst-plugin/tags/0.8.4</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-jrst-plug…</url> </scm>

1 0

r277 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 18 Feb '09

18 Feb '09

Author: tchemit Date: 2009-02-18 18:44:56 +0000 (Wed, 18 Feb 2009) New Revision: 277 Modified: maven-jrst-plugin/trunk/pom.xml Log: dernier commit avant release (pas possible d'utiliser le project.Version pour le plugin...) Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:40:13 UTC (rev 276) +++ maven-jrst-plugin/trunk/pom.xml 2009-02-18 18:44:56 UTC (rev 277) @@ -97,7 +97,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${project.version}</version> + <version>0.8.3</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut>

1 0