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

r297 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org April 9, 2009

April 9, 2009

Author: tchemit Date: 2009-04-09 15:26:29 +0000 (Thu, 09 Apr 2009) New Revision: 297 Modified: jrst/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.8.5 Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-04-09 15:25:22 UTC (rev 296) +++ jrst/trunk/pom.xml 2009-04-09 15:26:29 UTC (rev 297) @@ -1,8 +1,5 @@ <?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/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> @@ -17,7 +14,7 @@ </parent> <artifactId>jrst</artifactId> - <version>0.8.5-SNAPSHOT</version> + <version>0.8.5</version> <dependencies> <dependency> @@ -252,9 +249,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/jrst/tags/0.8.5</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/tags/0.8.5</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/tags/0.8.5…</url> </scm>

1 0

r296 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org April 9, 2009

April 9, 2009

Author: tchemit Date: 2009-04-09 15:25:22 +0000 (Thu, 09 Apr 2009) New Revision: 296 Modified: maven-jrst-plugin/trunk/changelog.txt Log: prepare release Modified: maven-jrst-plugin/trunk/changelog.txt =================================================================== --- maven-jrst-plugin/trunk/changelog.txt 2009-04-09 15:25:19 UTC (rev 295) +++ maven-jrst-plugin/trunk/changelog.txt 2009-04-09 15:25:22 UTC (rev 296) @@ -1,3 +1,6 @@ +ver-0.8.5 chemit 20090409 + * follow jrst version + ver-0-8-4 chemit 20090218 * 20090210 [chemit] use lutinproject:3.4 * 20090205 [chatellier] Set default locale to 'en'

1 0

r295 - doxia-module-jrst/trunk
by tchemit＠users.labs.libre-entreprise.org April 9, 2009

April 9, 2009

Author: tchemit Date: 2009-04-09 15:25:19 +0000 (Thu, 09 Apr 2009) New Revision: 295 Modified: doxia-module-jrst/trunk/changelog.txt Log: prepare release Modified: doxia-module-jrst/trunk/changelog.txt =================================================================== --- doxia-module-jrst/trunk/changelog.txt 2009-04-09 15:25:15 UTC (rev 294) +++ doxia-module-jrst/trunk/changelog.txt 2009-04-09 15:25:19 UTC (rev 295) @@ -1,3 +1,3 @@ -doxia-module-jrst (0.8.5-SNAPSHOT) chatellier +doxia-module-jrst (1.0.0) chemit * Initial release \ No newline at end of file

1 0

r294 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org April 9, 2009

April 9, 2009

Author: tchemit Date: 2009-04-09 15:25:15 +0000 (Thu, 09 Apr 2009) New Revision: 294 Modified: jrst/trunk/changelog.txt Log: prepare release Modified: jrst/trunk/changelog.txt =================================================================== --- jrst/trunk/changelog.txt 2009-04-09 14:06:33 UTC (rev 293) +++ jrst/trunk/changelog.txt 2009-04-09 15:25:15 UTC (rev 294) @@ -1,4 +1,4 @@ -ver-0.8.5 xxx 20090218 +ver-0.8.5 chemit 20090409 * Fix admonition * Fix comment directive and titles trailing spaces

1 0

r293 - jrst/trunk/src/main/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org April 9, 2009

April 9, 2009

Author: chatellier Date: 2009-04-09 14:06:33 +0000 (Thu, 09 Apr 2009) New Revision: 293 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java Log: Remove fix, that doesn't work Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-04-09 13:47:02 UTC (rev 292) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-04-09 14:06:33 UTC (rev 293) @@ -2276,8 +2276,6 @@ } String resultElementText = text.trim(); - resultElementText = resultElementText.replace("<", "<"); - resultElementText = resultElementText.replace(">", ">"); Element result = DocumentHelper.parseText( "<TMP>" + resultElementText + "</TMP>").getRootElement();

1 0

r292 - in doxia-module-jrst/trunk: . src/site src/site/apt
by chatellier＠users.labs.libre-entreprise.org April 9, 2009

April 9, 2009

Author: chatellier Date: 2009-04-09 13:47:02 +0000 (Thu, 09 Apr 2009) New Revision: 292 Added: doxia-module-jrst/trunk/src/site/apt/ doxia-module-jrst/trunk/src/site/apt/devel.apt doxia-module-jrst/trunk/src/site/apt/index.apt Removed: doxia-module-jrst/trunk/src/site/apt/devel.rst doxia-module-jrst/trunk/src/site/apt/index.rst doxia-module-jrst/trunk/src/site/rst/ Modified: doxia-module-jrst/trunk/pom.xml Log: Move site to apt to remove cycle. Version move to 1.0.x (for doxia 1.0) Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-04-09 12:36:21 UTC (rev 291) +++ doxia-module-jrst/trunk/pom.xml 2009-04-09 13:47:02 UTC (rev 292) @@ -1,6 +1,6 @@ <?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"> + 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> @@ -15,13 +15,13 @@ </parent> <artifactId>doxia-module-jrst</artifactId> - <version>0.8.5-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-xdoc</artifactId> - <version>1.0</version> + <version>${doxia.version}</version> </dependency>  <dependency> @@ -40,7 +40,7 @@ <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> <type>test-jar</type> - <version>1.0</version> + <version>${doxia.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -61,6 +61,7 @@ <properties> <labs.id>54</labs.id> <labs.project>jrst</labs.project> + <doxia.version>1.0</doxia.version> </properties> <developers> @@ -101,21 +102,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> -  - <configuration> - <siteDirectory>src/site</siteDirectory> - </configuration> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>0.8.5-SNAPSHOT</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> Copied: doxia-module-jrst/trunk/src/site/apt (from rev 289, doxia-module-jrst/trunk/src/site/rst) Copied: doxia-module-jrst/trunk/src/site/apt/devel.apt (from rev 289, doxia-module-jrst/trunk/src/site/rst/devel.rst) =================================================================== --- doxia-module-jrst/trunk/src/site/apt/devel.apt (rev 0) +++ doxia-module-jrst/trunk/src/site/apt/devel.apt 2009-04-09 13:47:02 UTC (rev 292) @@ -0,0 +1,10 @@ + ------------- + Documentation + ------------- + +Documentation + + JRst doxia module, is inherited from {{{http://maven.apache.org/doxia/doxia-1.0.x/doxia-modules/doxia-module-xdoc/index.html}doxia-module-xdoc}}. + + It just intercept xdoc parser call, transform RST into xdoc, and + then send generated xdoc to XDoc parser. \ No newline at end of file Deleted: doxia-module-jrst/trunk/src/site/apt/devel.rst =================================================================== --- doxia-module-jrst/trunk/src/site/rst/devel.rst 2009-03-03 16:25:43 UTC (rev 289) +++ doxia-module-jrst/trunk/src/site/apt/devel.rst 2009-04-09 13:47:02 UTC (rev 292) @@ -1,9 +0,0 @@ -Documentation -============= - -JRst doxia module, is inherited from `doxia-module-xdoc`_. - -It just intercept xdoc parser call, transform RST into xdoc, and -then send generated xdoc to XDoc parser. - -.. _doxia-module-xdoc: http://maven.apache.org/doxia/doxia-1.0.x/doxia-modules/doxia-module-xdoc/i… \ No newline at end of file Copied: doxia-module-jrst/trunk/src/site/apt/index.apt (from rev 289, doxia-module-jrst/trunk/src/site/rst/index.rst) =================================================================== --- doxia-module-jrst/trunk/src/site/apt/index.apt (rev 0) +++ doxia-module-jrst/trunk/src/site/apt/index.apt 2009-04-09 13:47:02 UTC (rev 292) @@ -0,0 +1,27 @@ + ----------------- + Doxia Module JRst + ----------------- + +Configuration + +-------------------------------------------------- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>2.0</version> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> +-------------------------------------------------- + + That it ! Then run "mvn site". + + +Warning + + This version only works with doxia-1.0.x (provided by maven-site-plugin-2.0). \ No newline at end of file Deleted: doxia-module-jrst/trunk/src/site/apt/index.rst =================================================================== --- doxia-module-jrst/trunk/src/site/rst/index.rst 2009-03-03 16:25:43 UTC (rev 289) +++ doxia-module-jrst/trunk/src/site/apt/index.rst 2009-04-09 13:47:02 UTC (rev 292) @@ -1,27 +0,0 @@ -Doxia Module JRst -================= - -Configuration -------------- - -:: - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${doxia-module-jrst.version}</version> - </dependency> - </dependencies> - </plugin> - -That it ! Then run "mvn site". - - -Links ------ - - * http://docutils.sourceforge.net/ \ No newline at end of file

1 0

r291 - maven-jrst-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org April 9, 2009

April 9, 2009

Author: chatellier Date: 2009-04-09 12:36:21 +0000 (Thu, 09 Apr 2009) New Revision: 291 Modified: maven-jrst-plugin/trunk/pom.xml Log: Fix xsd location Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-04-02 14:35:20 UTC (rev 290) +++ maven-jrst-plugin/trunk/pom.xml 2009-04-09 12:36:21 UTC (rev 291) @@ -1,5 +1,5 @@ <?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"> +<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>

1 0

r290 - in jrst/trunk: . src/main/java/org/codelutin/jrst
by chatellier＠users.labs.libre-entreprise.org April 2, 2009

April 2, 2009

Author: chatellier Date: 2009-04-02 14:35:20 +0000 (Thu, 02 Apr 2009) New Revision: 290 Modified: jrst/trunk/changelog.txt jrst/trunk/pom.xml jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java jrst/trunk/src/main/java/org/codelutin/jrst/JRSTGenerator.java jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java Log: Fix admonition (warning, etc...) Improve code. Modified: jrst/trunk/changelog.txt =================================================================== --- jrst/trunk/changelog.txt 2009-03-03 16:25:43 UTC (rev 289) +++ jrst/trunk/changelog.txt 2009-04-02 14:35:20 UTC (rev 290) @@ -1,3 +1,10 @@ +ver-0.8.5 xxx 20090218 + + * Fix admonition + * Fix comment directive and titles trailing spaces + * Readd ODT support ? + * Readd PDF support ? + ver-0.8.4 chemit 20090218 * Fix javadoc Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2009-03-03 16:25:43 UTC (rev 289) +++ jrst/trunk/pom.xml 2009-04-02 14:35:20 UTC (rev 290) @@ -1,5 +1,8 @@ <?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"> +<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> @@ -72,13 +75,10 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>net.sf.docbook</groupId> + <groupId>org.docbook</groupId> <artifactId>docbook-xsl</artifactId> - <version>1.74.0</version> - <type>zip</type> - <classifier>resources</classifier> - <scope>runtime</scope> - </dependency> + <version>1.72.0</version> + </dependency> </dependencies>  @@ -178,9 +178,9 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> -  + </configuration> <executions> <execution> <id>copy-dependencies</id> @@ -210,17 +210,17 @@ </executions> </plugin> -  + </plugin> </plugins> <pluginManagement> @@ -251,11 +251,10 @@    -  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/jrst/jrst/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/jrst/trunk/?roo…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm>  Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-03-03 16:25:43 UTC (rev 289) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-04-02 14:35:20 UTC (rev 290) @@ -52,6 +52,7 @@ import org.codelutin.i18n.I18n; import org.codelutin.util.FileCompletion; import org.codelutin.util.FileUtil; +import org.codelutin.util.Resource; import org.codelutin.util.StringUtil; import org.dom4j.Document; import org.dom4j.io.OutputFormat; @@ -82,60 +83,65 @@ NEVER, IFNEWER, ALLTIME } - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(JRST.class); + /** to use log facility, just put in your code: log.info("..."); */ + protected static Log log = LogFactory.getLog(JRST.class); - // XSL Stylesheet to transforme something to other format - static final private String rst2xhtml = "/xsl/rst2xhtml.xsl"; + /** XSL Stylesheet to transform RST into HTML. */ + protected static final String rst2xhtml = "/xsl/rst2xhtml.xsl"; + /** XSL Stylesheet to transform RST into Xdoc. */ + protected static final String rst2xdoc = "/xsl/rst2xdoc.xsl"; + /** XSL Stylesheet to transform RST into Docbook. */ + protected static final String rst2docbook = "/xsl/dn2dbk.xsl"; - static final private String rst2xdoc = "/xsl/rst2xdoc.xsl"; + /** XSL Stylesheet to transform Docbook into xHTML. */ + protected static final String docbook2xhtml = "/xhtml/docbook.xsl"; + /** XSL Stylesheet to transform Docbook into javahelp. */ + protected static final String docbook2javahelp = "/javahelp/javahelp.xsl"; + /** XSL Stylesheet to transform Docbook into htmlhelp. */ + protected static final String docbook2htmlhelp = "/htmlhelp/htmlhelp.xsl"; + + /** XSL Stylesheet to transform xml into rst. */ + protected static final String rst2rst = "/xsl/xml2rst.xsl"; - static final private String rst2docbook = "/xsl/dn2dbk.xsl"; - // static final private String walshDir = - // "/home/letellier/docbook5-xsl-1.72.0/"; - // static final private String walshDir = "/docbook-xsl-nwalsh"; - static final private String walshDir = ""; + /** XSL Stylesheet to transform Docbook into ODF. */ + protected static final String docbook2odf = "/xsl/docbook2odf-0.244/docbook.xsl"; + /** XSL Stylesheet to transform Docbook into PDF. */ + protected static final String docbook2fo = "/fo/docbook.xsl"; - // static final private String docbook2odfDir = "/docbook2odf-0.211"; - static final private String docbook2xhtml = walshDir + "/xhtml/docbook.xsl"; + /** HTML output format type */ + public static final String TYPE_HTML = "html"; - static final private String docbook2javahelp = walshDir - + "/javahelp/javahelp.xsl"; + /** XDOC output format type */ + public static final String TYPE_XDOC = "xdoc"; - // static final private String dbkx2html = walshDir + "/html/onechunk.xsl"; - static final private String docbook2htmlhelp = walshDir - + "/htmlhelp/htmlhelp.xsl"; + /** DOCBOOK output format type */ + public static final String TYPE_DOCBOOK = "docbook"; - static final private String rst2rst = "/xsl/xml2rst.xsl"; + /** XHTML output format type */ + public static final String TYPE_XHTML = "xhtml"; - // static final private String docbook2odf = docbook2odfDir + - // "/xsl/docbook.xsl"; - static final private String docbook2fo = walshDir + "/fo/docbook.xsl"; + /** JAVA HELP output format type */ + public static final String TYPE_JAVAHELP = "javahelp"; - // Out put type available - static final public String TYPE_HTML = "html"; + /** HTML HELP output format type */ + public static final String TYPE_HTMLHELP = "htmlhelp"; - static final public String TYPE_XDOC = "xdoc"; + /** RST output format type */ + public static final String TYPE_RST = "rst"; - static final public String TYPE_DOCBOOK = "docbook"; + /** ODT output format type */ + public static final String TYPE_ODT = "odt"; + + /** FO output format type */ + public static final String TYPE_FO = "fo"; - static final public String TYPE_XHTML = "xhtml"; + /** PDF output format type */ + public static final String TYPE_PDF = "pdf"; - static final public String TYPE_JAVAHELP = "javahelp"; - - static final public String TYPE_HTMLHELP = "htmlhelp"; - - static final public String TYPE_RST = "rst"; - - // static final public String TYPE_ODT = "odt"; - static final public String TYPE_FO = "fo"; - - static final public String TYPE_PDF = "pdf"; - /** * key, Out type; value: chain of XSL file to provide wanted file for output */ - static private Map<String, String> stylesheets = null; + protected static Map<String, String> stylesheets = null; static { stylesheets = new HashMap<String, String>(); @@ -146,12 +152,17 @@ stylesheets.put(TYPE_JAVAHELP, rst2docbook + "," + docbook2javahelp); stylesheets.put(TYPE_HTMLHELP, rst2docbook + "," + docbook2htmlhelp); stylesheets.put(TYPE_RST, rst2rst); - // stylesheets.put(TYPE_ODT, rst2docbook+","+docbook2odf); + stylesheets.put(TYPE_ODT, rst2docbook + "," + docbook2odf); stylesheets.put(TYPE_FO, rst2docbook + "," + docbook2fo); stylesheets.put(TYPE_PDF, rst2docbook + "," + docbook2fo); } - static public void main(String[] args) throws Exception { + /** + * + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Exception { I18n.init(); @@ -169,8 +180,9 @@ System.out.println(cli.getHelpMessage()); return; } - if (option.isConsole()) + if (option.isConsole()) { args = askOptionText(); + } option = CliFactory.parseArguments(JRSTOption.class, args); // search xsl file list to apply String xslList = null; @@ -198,8 +210,9 @@ done = true; } } - if (!done) + if (!done) { result = askOptionText(); + } } catch (java.awt.HeadlessException e) { result = askOptionText(); } @@ -233,14 +246,7 @@ * @throws IOException */ private static String[] askOptionText() throws IOException { - // language - /*if (Locale.getDefault().getLanguage() == "fr") - I18n.init("fr", "FR"); - else - I18n.init("en", "US");*/ - //I18n.init(); - System.out.println(_("help?")); Boolean done = false; String cheminRST = ""; @@ -304,8 +310,9 @@ } if (cheminXSL.length() == 0 || !type - .matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf")) + .matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf")) { type = "xml"; + } } boolean ecraser = false; done = false; @@ -423,7 +430,8 @@ if (file.exists()) { stylesheet = file.toURL(); } else { - stylesheet = JRST.class.getResource(xsl); + //stylesheet = JRST.class.getResource(xsl); + stylesheet = Resource.getURL(xsl); } if (stylesheet == null) { throw new FileNotFoundException("Can't find stylesheet: " Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTGenerator.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTGenerator.java 2009-03-03 16:25:43 UTC (rev 289) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTGenerator.java 2009-04-02 14:35:20 UTC (rev 290) @@ -283,7 +283,7 @@ */ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - System.err.println("## resolveEntity publicId '" + publicId + log.debug("## resolveEntity publicId '" + publicId + "' systemId: '" + systemId + "'"); return null; } Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-03-03 16:25:43 UTC (rev 289) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-04-02 14:35:20 UTC (rev 290) @@ -57,10 +57,10 @@ private static Log log = LogFactory.getLog(JRSTLexer.class); public static final String BULLET_CHAR = "*" + "+" + "-"/* - * + "\u2022" + - * "\u2023" + - * "\u2043" - */; + * + "\u2022" + + * "\u2023" + + * "\u2043" + */; public static final String TITLE_CHAR = "-=-~'`^+:!\"#$%&*,./;|?@\\_[\\]{}<>()"; @@ -259,11 +259,7 @@ in.unread(firstLine, true); int level = level(firstLine); if (level >= minLeftMargin) { - - // FIXME should be somethings like that: - // result = in.readWhile("^\\S{" + level + "}.*"); - // but tests fail - result = in.readWhile("^ {" + level + "}\\S+.*"); + result = in.readWhile("^\\s{" + level + "}\\S+.*"); } } @@ -968,7 +964,7 @@ * @return Element * @throws IOException */ - private Element peekAdmonition() throws IOException { + protected Element peekAdmonition() throws IOException { beginPeek(); Element result = null; String line = in.readLine(); @@ -997,29 +993,31 @@ .length()); result.addAttribute("title", title); - } else + } else { result.addAttribute("type", matcher.group()); - + } + String firstLine = ""; - if (!admonition && matcher.end() + 2 < line.length()) + if (!admonition && matcher.end() + 2 < line.length()) { firstLine = line .substring(matcher.end() + 2, line.length()); + } line = in.readLine(); if (line != null) { - if (line.matches("\\s*")) + if (line.matches("\\s*")) { line = in.readLine(); - if (line != null) { - if (!line.matches("\\s*")) { - level = level(line); - String txt = firstLine.trim() + "\n" + line + "\n"; - txt += "\n" + readBlockWithBlankLine(level); - result.setText(txt); - } - - } else + } + if (line != null && !line.matches("\\s*")) { + level = level(line); + String txt = firstLine.trim() + "\n" + line + "\n"; + txt += "\n" + readBlockWithBlankLine(level); + result.setText(txt); + } else { result.setText(firstLine); - } else + } + } else { result.setText(firstLine); + } } } endPeek(); @@ -1941,12 +1939,15 @@ } } else { String title = in.readLine(); - if (title != null && startsWithTitleChar(title) - && line.replaceFirst("\\s*$", "").length() == title.length()) { + if (title != null + && startsWithTitleChar(title) + && line.replaceFirst("\\s*$", "").length() == title + .length()) { result = DocumentHelper.createElement(TITLE).addAttribute( "type", "simple").addAttribute("char", - title.substring(0, 1)).addText(line.replaceFirst("\\s*$", "")); + title.substring(0, 1)).addText( + line.replaceFirst("\\s*$", "")); } } } @@ -2084,7 +2085,7 @@ 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(); Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-03-03 16:25:43 UTC (rev 289) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java 2009-04-02 14:35:20 UTC (rev 290) @@ -29,23 +29,82 @@ package org.codelutin.jrst; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; -import static org.codelutin.jrst.ReStructuredText.*; -import org.codelutin.jrst.directive.ContentDirective; -import org.codelutin.jrst.directive.DateDirective; -import org.codelutin.jrst.directive.ImageDirective; -import org.codelutin.jrst.directive.SectnumDirective; -import org.codelutin.util.StringUtil; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.DocumentHelper; -import org.dom4j.Element; -import org.dom4j.Node; -import org.dom4j.VisitorSupport; +import static org.codelutin.jrst.ReStructuredText.ADDRESS; +import static org.codelutin.jrst.ReStructuredText.ADMONITION; +import static org.codelutin.jrst.ReStructuredText.ATTRIBUTION; +import static org.codelutin.jrst.ReStructuredText.AUTHOR; +import static org.codelutin.jrst.ReStructuredText.AUTHORS; +import static org.codelutin.jrst.ReStructuredText.BLOCK_QUOTE; +import static org.codelutin.jrst.ReStructuredText.BULLET_LIST; +import static org.codelutin.jrst.ReStructuredText.COLSPEC; +import static org.codelutin.jrst.ReStructuredText.COMMENT; +import static org.codelutin.jrst.ReStructuredText.CONTACT; +import static org.codelutin.jrst.ReStructuredText.COPYRIGHT; +import static org.codelutin.jrst.ReStructuredText.DATE; +import static org.codelutin.jrst.ReStructuredText.DECORATION; +import static org.codelutin.jrst.ReStructuredText.DEFINITION; +import static org.codelutin.jrst.ReStructuredText.DEFINITION_LIST; +import static org.codelutin.jrst.ReStructuredText.DEFINITION_LIST_ITEM; +import static org.codelutin.jrst.ReStructuredText.DESCRIPTION; +import static org.codelutin.jrst.ReStructuredText.DOCINFO; +import static org.codelutin.jrst.ReStructuredText.DOCTEST_BLOCK; +import static org.codelutin.jrst.ReStructuredText.DOCUMENT; +import static org.codelutin.jrst.ReStructuredText.EMPHASIS; +import static org.codelutin.jrst.ReStructuredText.ENTRY; +import static org.codelutin.jrst.ReStructuredText.ENUMERATED_LIST; +import static org.codelutin.jrst.ReStructuredText.FIELD; +import static org.codelutin.jrst.ReStructuredText.FIELD_BODY; +import static org.codelutin.jrst.ReStructuredText.FIELD_LIST; +import static org.codelutin.jrst.ReStructuredText.FIELD_NAME; +import static org.codelutin.jrst.ReStructuredText.FOOTER; +import static org.codelutin.jrst.ReStructuredText.FOOTNOTE; +import static org.codelutin.jrst.ReStructuredText.FOOTNOTE_REFERENCE; +import static org.codelutin.jrst.ReStructuredText.FOOTNOTE_SYMBOL; +import static org.codelutin.jrst.ReStructuredText.HEADER; +import static org.codelutin.jrst.ReStructuredText.IMAGE; +import static org.codelutin.jrst.ReStructuredText.LINE; +import static org.codelutin.jrst.ReStructuredText.LINE_BLOCK; +import static org.codelutin.jrst.ReStructuredText.LIST_ITEM; +import static org.codelutin.jrst.ReStructuredText.LITERAL; +import static org.codelutin.jrst.ReStructuredText.LITERAL_BLOCK; +import static org.codelutin.jrst.ReStructuredText.OPTION; +import static org.codelutin.jrst.ReStructuredText.OPTION_ARGUMENT; +import static org.codelutin.jrst.ReStructuredText.OPTION_GROUP; +import static org.codelutin.jrst.ReStructuredText.OPTION_LIST; +import static org.codelutin.jrst.ReStructuredText.OPTION_LIST_ITEM; +import static org.codelutin.jrst.ReStructuredText.OPTION_STRING; +import static org.codelutin.jrst.ReStructuredText.ORGANIZATION; +import static org.codelutin.jrst.ReStructuredText.PARAGRAPH; +import static org.codelutin.jrst.ReStructuredText.REFERENCE; +import static org.codelutin.jrst.ReStructuredText.REGEX_ANONYMOUS_HYPERLINK_REFERENCE; +import static org.codelutin.jrst.ReStructuredText.REGEX_EMAIL; +import static org.codelutin.jrst.ReStructuredText.REGEX_EMPHASIS; +import static org.codelutin.jrst.ReStructuredText.REGEX_FOOTNOTE_REFERENCE; +import static org.codelutin.jrst.ReStructuredText.REGEX_HYPERLINK_REFERENCE; +import static org.codelutin.jrst.ReStructuredText.REGEX_INLINE_REFERENCE; +import static org.codelutin.jrst.ReStructuredText.REGEX_LITERAL; +import static org.codelutin.jrst.ReStructuredText.REGEX_REFERENCE; +import static org.codelutin.jrst.ReStructuredText.REGEX_STRONG; +import static org.codelutin.jrst.ReStructuredText.REGEX_SUBSTITUTION_REFERENCE; +import static org.codelutin.jrst.ReStructuredText.REVISION; +import static org.codelutin.jrst.ReStructuredText.ROW; +import static org.codelutin.jrst.ReStructuredText.SECTION; +import static org.codelutin.jrst.ReStructuredText.SIDEBAR; +import static org.codelutin.jrst.ReStructuredText.STATUS; +import static org.codelutin.jrst.ReStructuredText.STRONG; +import static org.codelutin.jrst.ReStructuredText.SUBSTITUTION_DEFINITION; +import static org.codelutin.jrst.ReStructuredText.SUBTITLE; +import static org.codelutin.jrst.ReStructuredText.TABLE; +import static org.codelutin.jrst.ReStructuredText.TARGET; +import static org.codelutin.jrst.ReStructuredText.TBODY; +import static org.codelutin.jrst.ReStructuredText.TERM; +import static org.codelutin.jrst.ReStructuredText.TGROUP; +import static org.codelutin.jrst.ReStructuredText.THEAD; +import static org.codelutin.jrst.ReStructuredText.TITLE; +import static org.codelutin.jrst.ReStructuredText.TOPIC; +import static org.codelutin.jrst.ReStructuredText.TRANSITION; +import static org.codelutin.jrst.ReStructuredText.VERSION; import java.io.BufferedReader; import java.io.File; @@ -63,6 +122,22 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.jrst.directive.ContentDirective; +import org.codelutin.jrst.directive.DateDirective; +import org.codelutin.jrst.directive.ImageDirective; +import org.codelutin.jrst.directive.SectnumDirective; +import org.codelutin.util.StringUtil; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.dom4j.Node; +import org.dom4j.VisitorSupport; + /* * * <pre> +--------------------------------------------------------------------+ | @@ -2199,8 +2274,12 @@ text = start + temporaries.get(tempKey) + end; matcher = p.matcher(text); } + + String resultElementText = text.trim(); + resultElementText = resultElementText.replace("<", "<"); + resultElementText = resultElementText.replace(">", ">"); Element result = DocumentHelper.parseText( - "<TMP>" + text.trim() + "</TMP>").getRootElement(); + "<TMP>" + resultElementText + "</TMP>").getRootElement(); e.setText(""); e.appendContent(result);

1 0

r289 - in doxia-module-jrst/trunk: . src src/main src/main/components src/main/java src/main/java/org src/main/java/org/codelutin src/main/java/org/codelutin/jrst src/site src/site/rst src/test src/test/java src/test/java/org src/test/java/org/codelutin src/test/java/org/codelutin/jrst src/test/resources
by chatellier＠users.labs.libre-entreprise.org March 3, 2009

March 3, 2009

Author: chatellier Date: 2009-03-03 16:25:43 +0000 (Tue, 03 Mar 2009) New Revision: 289 Added: doxia-module-jrst/trunk/LICENSE.txt doxia-module-jrst/trunk/README.txt doxia-module-jrst/trunk/changelog.txt doxia-module-jrst/trunk/pom.xml doxia-module-jrst/trunk/src/ doxia-module-jrst/trunk/src/main/ doxia-module-jrst/trunk/src/main/components/ doxia-module-jrst/trunk/src/main/components/components.xml doxia-module-jrst/trunk/src/main/java/ doxia-module-jrst/trunk/src/main/java/org/ doxia-module-jrst/trunk/src/main/java/org/codelutin/ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java doxia-module-jrst/trunk/src/site/ doxia-module-jrst/trunk/src/site/rst/ doxia-module-jrst/trunk/src/site/rst/devel.rst doxia-module-jrst/trunk/src/site/rst/index.rst doxia-module-jrst/trunk/src/site/site.xml doxia-module-jrst/trunk/src/test/ doxia-module-jrst/trunk/src/test/java/ doxia-module-jrst/trunk/src/test/java/org/ doxia-module-jrst/trunk/src/test/java/org/codelutin/ doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/ doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java doxia-module-jrst/trunk/src/test/resources/ doxia-module-jrst/trunk/src/test/resources/test.rst Modified: doxia-module-jrst/trunk/ Log: Initial import. Property changes on: doxia-module-jrst/trunk ___________________________________________________________________ Name: svn:ignore + .settings target .classpath .project Added: doxia-module-jrst/trunk/LICENSE.txt =================================================================== --- doxia-module-jrst/trunk/LICENSE.txt (rev 0) +++ doxia-module-jrst/trunk/LICENSE.txt 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: doxia-module-jrst/trunk/README.txt =================================================================== --- doxia-module-jrst/trunk/README.txt (rev 0) +++ doxia-module-jrst/trunk/README.txt 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,21 @@ +Doxia Module JRst +================= + +Configuration +------------- + +To use it, put it in your pom.xml : + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${doxia-module-jrst.version}</version> + </dependency> + </dependencies> + </plugin> + +That it ! Then run "mvn site". Added: doxia-module-jrst/trunk/changelog.txt =================================================================== --- doxia-module-jrst/trunk/changelog.txt (rev 0) +++ doxia-module-jrst/trunk/changelog.txt 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,3 @@ +doxia-module-jrst (0.8.5-SNAPSHOT) chatellier + + * Initial release \ No newline at end of file Added: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml (rev 0) +++ doxia-module-jrst/trunk/pom.xml 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,156 @@ +<?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>doxia-module-jrst</artifactId> + <version>0.8.5-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + <version>1.0</version> + </dependency> +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>jrst</artifactId> + <version>0.8.5-SNAPSHOT</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <type>test-jar</type> + <version>1.0</version> + <scope>test</scope> + </dependency> + </dependencies> + +  +  +  + + <name>Doxia JRst Module</name> + <description>JRst module for doxia</description> + <inceptionYear>2009</inceptionYear> + +  +  +  + <packaging>jar</packaging> + + <properties> + <labs.id>54</labs.id> + <labs.project>jrst</labs.project> + </properties> + + <developers> + <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> + </developers> + + <build> + + <defaultGoal>install</defaultGoal> + + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.5</version> + <configuration> + <descriptors> + <descriptor>src/main/components/components.xml</descriptor> + <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <goals> + <goal>descriptor</goal> + <goal>merge-descriptors</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> +  + <configuration> + <siteDirectory>src/site</siteDirectory> + </configuration> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>0.8.5-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-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> +</project> \ No newline at end of file Added: doxia-module-jrst/trunk/src/main/components/components.xml =================================================================== --- doxia-module-jrst/trunk/src/main/components/components.xml (rev 0) +++ doxia-module-jrst/trunk/src/main/components/components.xml 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<component-set> + <components> + <component> + <role>org.apache.maven.doxia.parser.Parser</role> + <role-hint>jrst</role-hint> + <implementation>org.codelutin.jrst.JrstParser</implementation> + <description>Parse an RST model and call XDoc parser.</description> + <requirements> + <requirement> + <role>org.apache.maven.doxia.macro.manager.MacroManager</role> + <field-name>macroManager</field-name> + </requirement> + </requirements> + </component> + </components> +</component-set> Added: doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java =================================================================== --- doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java (rev 0) +++ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstParser.java 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,70 @@ +/* *##% Doxia module jrst + * Copyright (C) 2009 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>. ##%*/ + +package org.codelutin.jrst; + +import java.io.FileNotFoundException; +import java.io.Reader; +import java.io.StringReader; +import java.net.URL; + +import org.apache.maven.doxia.module.xdoc.XdocParser; +import org.apache.maven.doxia.parser.ParseException; +import org.apache.maven.doxia.sink.Sink; +import org.dom4j.Document; + +/** + * Parse an RST model, transform it into xdoc model and emit events into the + * specified doxia Sink. + * + * @author <a href="mailto:jason@maven.org">Jason van Zyl</a> + * @version $Id: JrstParser.java 746992 2009-02-23 12:35:59Z vsiveton $ + * @since 0.9.0 + * @plexus.component role="org.apache.maven.doxia.parser.Parser" + * role-hint="jrst" + */ +public class JrstParser extends XdocParser { + + protected final static String RST2XDOC = "/xsl/rst2xdoc.xsl"; + + /** {@inheritDoc} */ + public void parse(Reader source, Sink sink) throws ParseException { + + try { + + // Load source as RST Document + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(source); + + // Apply xsl on rst RST Document + JRSTGenerator gen = new JRSTGenerator(); + URL stylesheet = JrstParser.class.getResource(RST2XDOC); + if (stylesheet == null) { + throw new FileNotFoundException("Can't find stylesheet: " + + RST2XDOC); + } + doc = gen.transform(doc, stylesheet); + + // Give xsl result to XDoc parser + Reader reader = new StringReader(doc.asXML()); + super.parse(reader, sink); + } catch (Exception e) { + throw new ParseException("Can't parse rst file", e); + } + + } +} Added: doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java =================================================================== --- doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java (rev 0) +++ doxia-module-jrst/trunk/src/main/java/org/codelutin/jrst/JrstSiteModule.java 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,46 @@ +/* *##% Doxia module jrst + * Copyright (C) 2009 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>. ##% */ + +package org.codelutin.jrst; + +import org.apache.maven.doxia.module.site.AbstractSiteModule; + +/** + * JrstSiteModule. + * + * @author chatellier + * @version $Revision : 1 $ + * @since 0.9.0 + * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="jrst" + */ +public class JrstSiteModule extends AbstractSiteModule { + + /** {@inheritDoc} */ + public String getSourceDirectory() { + return "rst"; + } + + /** {@inheritDoc} */ + public String getExtension() { + return "rst"; + } + + /** {@inheritDoc} */ + public String getParserId() { + return "jrst"; + } +} Added: doxia-module-jrst/trunk/src/site/rst/devel.rst =================================================================== --- doxia-module-jrst/trunk/src/site/rst/devel.rst (rev 0) +++ doxia-module-jrst/trunk/src/site/rst/devel.rst 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,9 @@ +Documentation +============= + +JRst doxia module, is inherited from `doxia-module-xdoc`_. + +It just intercept xdoc parser call, transform RST into xdoc, and +then send generated xdoc to XDoc parser. + +.. _doxia-module-xdoc: http://maven.apache.org/doxia/doxia-1.0.x/doxia-modules/doxia-module-xdoc/i… \ No newline at end of file Added: doxia-module-jrst/trunk/src/site/rst/index.rst =================================================================== --- doxia-module-jrst/trunk/src/site/rst/index.rst (rev 0) +++ doxia-module-jrst/trunk/src/site/rst/index.rst 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,27 @@ +Doxia Module JRst +================= + +Configuration +------------- + +:: + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${doxia-module-jrst.version}</version> + </dependency> + </dependencies> + </plugin> + +That it ! Then run "mvn site". + + +Links +----- + + * http://docutils.sourceforge.net/ \ No newline at end of file Added: doxia-module-jrst/trunk/src/site/site.xml =================================================================== --- doxia-module-jrst/trunk/src/site/site.xml (rev 0) +++ doxia-module-jrst/trunk/src/site/site.xml 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.3</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="JRst" href="http://jrst.labs.libre-entreprise.org/"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/> + <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/> + </links> + + <menu name="User"> + <item href="/index.html" name="About"/> + + </menu> + + <menu name="Developer"> + <item href="/devel.html" name="Documentation"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Added: doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java =================================================================== --- doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java (rev 0) +++ doxia-module-jrst/trunk/src/test/java/org/codelutin/jrst/JrstParserTest.java 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,76 @@ +/* *##% Doxia module jrst + * Copyright (C) 2009 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>. ##% */ + +package org.codelutin.jrst; + +import java.io.Reader; +import java.io.StringWriter; + +import org.apache.maven.doxia.module.xdoc.XdocSink; +import org.apache.maven.doxia.parser.AbstractParserTest; +import org.apache.maven.doxia.parser.Parser; +import org.apache.maven.doxia.sink.Sink; + +/** + * @author chatellier + * @version $Revision : 1$ + */ +public class JrstParserTest extends AbstractParserTest { + + protected JrstParser parser; + + /** @see junit.framework.TestCase#setUp() */ + protected void setUp() throws Exception { + super.setUp(); + + parser = (JrstParser) lookup(Parser.ROLE, "jrst"); + } + + /** @see org.apache.maven.doxia.parser.AbstractParserTest#createParser() */ + protected Parser createParser() { + return parser; + } + + /** @throws Exception */ + public void testParseRst() throws Exception { + StringWriter output = null; + Reader reader = null; + + try { + output = new StringWriter(); + reader = getTestReader("test", "rst"); + + Sink sink = new XdocSink(output); + createParser().parse(reader, sink); + + /* FIXME output is null :( + assertTrue(output.toString().indexOf("emphasis") != -1); + assertTrue(output.toString().indexOf("This is the first item") != -1); + assertTrue(output.toString().indexOf("Title") != -1); + assertTrue(output.toString().indexOf("blocks.") != -1);*/ + } finally { + output.close(); + reader.close(); + } + } + + /** {@inheritDoc} */ + protected String outputExtension() { + return "rst"; + } + +} Added: doxia-module-jrst/trunk/src/test/resources/test.rst =================================================================== --- doxia-module-jrst/trunk/src/test/resources/test.rst (rev 0) +++ doxia-module-jrst/trunk/src/test/resources/test.rst 2009-03-03 16:25:43 UTC (rev 289) @@ -0,0 +1,51 @@ +Title +===== + +Subtitle +-------- + +*emphasis* + +**strong emphasis** + +`interpreted text` + +``inline literal`` + +http://docutils.sf.net/ + ++------------+------------+-----------+ +| Header 1 | Header 2 | Header 3 | ++============+============+===========+ +| body row 1 | column 2 | column 3 | ++------------+------------+-----------+ +| body row 2 | Cells may span columns.| ++------------+------------+-----------+ +| body row 3 | Cells may | - Cells | ++------------+ span rows. | - contain | +| body row 4 | | - blocks. | ++------------+------------+-----------+ + +:: + + Test + Sub test + + +Bullet lists: + +- This is item 1 +- This is item 2 + + +Enumerated lists: + +3. This is the first item +4. This is the second item +5. Enumerators are arabic numbers, + single letters, or roman numerals +6. List items should be sequentially + numbered, but need not start at 1 + (although not all formatters will + honour the first index). +#. This item is auto-enumerated \ No newline at end of file

1 0

r288 - / doxia-module-jrst
by chatellier＠users.labs.libre-entreprise.org March 3, 2009

March 3, 2009

Author: chatellier Date: 2009-03-03 16:24:57 +0000 (Tue, 03 Mar 2009) New Revision: 288 Added: doxia-module-jrst/ doxia-module-jrst/trunk/ Log: Initial import.

1 0