Author: jpages Date: 2012-05-29 10:02:04 +0200 (Tue, 29 May 2012) New Revision: 679 Url: http://nuiton.org/repositories/revision/jrst/679 Log: Mise ?\195?\160 jour des fichiers XML relatifs au site (ajout dans le footer de maven-site-nuiton.org.js ) Mise ?\195?\160 jour de la documentation d?\195?\169veloppeur (diagrammeGeneration) Ajout dans les changelogs des modifications apport?\195?\169es par Jrst 1.6 Modified: branches/jrst-docutils-jython/changelog.txt branches/jrst-docutils-jython/docutils/changelog.txt branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_en.xml branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_fr.xml branches/jrst-docutils-jython/jrst-doc/changelog.txt branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeGeneration.png branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml branches/jrst-docutils-jython/jrst/changelog.txt branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java branches/jrst-docutils-jython/jrst/src/site/site_en.xml branches/jrst-docutils-jython/jrst/src/site/site_fr.xml branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_en.xml branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_fr.xml branches/jrst-docutils-jython/src/site/site_en.xml branches/jrst-docutils-jython/src/site/site_fr.xml Modified: branches/jrst-docutils-jython/changelog.txt =================================================================== --- branches/jrst-docutils-jython/changelog.txt 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/changelog.txt 2012-05-29 08:02:04 UTC (rev 679) @@ -1,3 +1,7 @@ +1.6.0 jpages 20120529 + + * Add footer script maven-site-nuiton.org.js + 1.0.1 xxx 200909xx * Add port in url regex Modified: branches/jrst-docutils-jython/docutils/changelog.txt =================================================================== --- branches/jrst-docutils-jython/docutils/changelog.txt 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/docutils/changelog.txt 2012-05-29 08:02:04 UTC (rev 679) @@ -1,3 +1,7 @@ +version-0.9 20120525 + + * Uses now docutils 0.9 + version-0.8.1 20120417 * first version with docutils 0.8.1 \ No newline at end of file Modified: branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java =================================================================== --- branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2012-05-29 08:02:04 UTC (rev 679) @@ -29,6 +29,9 @@ import java.io.FileWriter; import java.io.Reader; import java.io.StringReader; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.maven.doxia.module.xdoc.XdocParser; import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.sink.Sink; @@ -52,6 +55,7 @@ try { // Write the source in a file to use it with JRST File sourceFile = File.createTempFile("source",".rst"); + sourceFile.deleteOnExit(); FileWriter fileWriter = new FileWriter(sourceFile); IOUtil.copy(source, fileWriter); Modified: branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_en.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_en.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -66,5 +66,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_fr.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/doxia-module-jrst/src/site/site_fr.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -66,5 +66,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/jrst/changelog.txt =================================================================== --- branches/jrst-docutils-jython/jrst/changelog.txt 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst/changelog.txt 2012-05-29 08:02:04 UTC (rev 679) @@ -1,3 +1,7 @@ +ver 1.6.0 jpages 20120525 + * XML generation with Jython and DocUtils + * PDF generation with IText from HTML + ver 1.0.0 ? * migrate to org.nuiton groupId Modified: branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java =================================================================== --- branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst/src/main/java/org/nuiton/jrst/JRST.java 2012-05-29 08:02:04 UTC (rev 679) @@ -118,7 +118,7 @@ /** XSL Stylesheet to transform Docbook into PDF. */ protected static final String DOCBOOK_2_FO = "/docbook/fo/docbook.xsl"; - public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|rst|fo|pdf|odt|rtf"; + public static final String PATTERN_TYPE = "xml|xhtml|docbook|html|htmlInnerBody|xdoc|rst|fo|pdf"; /** HTML output format type */ public static final String TYPE_HTML = "html"; Modified: branches/jrst-docutils-jython/jrst/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/jrst/src/site/site_en.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst/src/site/site_en.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -85,5 +85,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/jrst/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/jrst/src/site/site_fr.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst/src/site/site_fr.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -87,5 +87,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/jrst-doc/changelog.txt =================================================================== --- branches/jrst-docutils-jython/jrst-doc/changelog.txt 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst-doc/changelog.txt 2012-05-29 08:02:04 UTC (rev 679) @@ -1,3 +1,9 @@ +ver 1.6.0 jpages 20120525 + * New skin (fluido) + * New version of dev documentation (Jython, DocUtils and IText) + * Warnings and errors fixed + + ver 1.0.0 ? * migrate to org.nuiton groupId Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-29 08:02:04 UTC (rev 679) @@ -39,7 +39,7 @@ Generation ========== -|diagrammegeneration| +|diagrammeGeneration| Links : @@ -49,6 +49,7 @@ * XMLmind (convertion from FO towards ODT and RTF) : http://www.xmlmind.com/foconverter/what_is_xfc.html * FOP (convertion from FO towards PDF) : http://xmlgraphics.apache.org/fop + * IText (convertion from HTML towards PDF) : http://itextpdf.com/ Use exemple =========== @@ -140,6 +141,6 @@ .. _Cascading Style Sheets: http://en.wikipedia.org/wiki/Cascading_Style_Sheets .. _DocUtils: http://docutils.sourceforge.net/docs/ref/doctree.html .. _Jython: http://jython.org/index.html -.. |diagrammegeneration| image:: images/diagrammeGeneration.png -.. |classDiagramme| image:: images/DiagrammeClass.png -.. |sequenceDiagramme| image:: images/DiagrammeSequence.png +.. |diagrammeGeneration| image:: images/diagrammeGeneration.png +.. |classDiagramme| image:: images/diagrammeClass.png +.. |sequenceDiagramme| image:: images/diagrammeSequence.png Modified: branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeGeneration.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2012-05-29 08:02:04 UTC (rev 679) @@ -53,6 +53,7 @@ * XMLmind (convertion de FO vers ODT et RTF) : http://www.xmlmind.com/foconverter/what_is_xfc.html * FOP (convertion de FO vers PDF) : http://xmlgraphics.apache.org/fop + * IText (convertion de HTML vers PDF) : http://itextpdf.com/ Exemple d'utilisation Modified: branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -93,5 +93,24 @@ href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> </menu> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -96,5 +96,24 @@ href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> </menu> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_en.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_en.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -68,5 +68,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_fr.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/maven-jrst-plugin/src/site/site_fr.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -66,6 +66,25 @@ </menu> <menu ref="reports"/> - + + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: branches/jrst-docutils-jython/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/src/site/site_en.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/src/site/site_en.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -48,6 +48,9 @@ <menu name="Language"> <item name="Français" href="../index.html"/> <item name="English" href="index.html"/> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> </menu> <menu name="Community"> @@ -68,5 +71,24 @@ </menu> <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: branches/jrst-docutils-jython/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/src/site/site_fr.xml 2012-05-25 13:49:52 UTC (rev 678) +++ branches/jrst-docutils-jython/src/site/site_fr.xml 2012-05-29 08:02:04 UTC (rev 679) @@ -49,6 +49,9 @@ <menu name="Langue"> <item name="Français" href="index.html"/> <item name="English" href="./en/index.html"/> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> </menu> <menu name="Communauté"> @@ -66,5 +69,24 @@ <menu ref="modules"/> <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>