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

r739 - trunk
by tchemit＠users.nuiton.org July 7, 2012

July 7, 2012

Author: tchemit Date: 2012-07-07 21:46:18 +0200 (Sat, 07 Jul 2012) New Revision: 739 Url: http://nuiton.org/repositories/revision/jrst/739 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-02 13:38:38 UTC (rev 738) +++ trunk/pom.xml 2012-07-07 19:46:18 UTC (rev 739) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <artifactId>jrst</artifactId>

1 0

r738 - in trunk: . docutils doxia-module-jrst doxia-module-jrst-legacy jrst jrst-doc jrst-site-util
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 15:38:38 +0200 (Mon, 02 Jul 2012) New Revision: 738 Url: http://nuiton.org/repositories/revision/jrst/738 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/docutils/pom.xml trunk/doxia-module-jrst-legacy/pom.xml trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst-site-util/pom.xml trunk/jrst/pom.xml trunk/pom.xml Modified: trunk/docutils/pom.xml =================================================================== (Binary files differ) Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2012-07-02 13:38:36 UTC (rev 737) +++ trunk/doxia-module-jrst/pom.xml 2012-07-02 13:38:38 UTC (rev 738) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/doxia-module-jrst-legacy/pom.xml =================================================================== --- trunk/doxia-module-jrst-legacy/pom.xml 2012-07-02 13:38:36 UTC (rev 737) +++ trunk/doxia-module-jrst-legacy/pom.xml 2012-07-02 13:38:38 UTC (rev 738) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2012-07-02 13:38:36 UTC (rev 737) +++ trunk/jrst/pom.xml 2012-07-02 13:38:38 UTC (rev 738) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2012-07-02 13:38:36 UTC (rev 737) +++ trunk/jrst-doc/pom.xml 2012-07-02 13:38:38 UTC (rev 738) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-site-util/pom.xml =================================================================== --- trunk/jrst-site-util/pom.xml 2012-07-02 13:38:36 UTC (rev 737) +++ trunk/jrst-site-util/pom.xml 2012-07-02 13:38:38 UTC (rev 738) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-02 13:38:36 UTC (rev 737) +++ trunk/pom.xml 2012-07-02 13:38:38 UTC (rev 738) @@ -34,7 +34,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.0.1</version> + <version>2.0.2-SNAPSHOT</version> <modules> <module>docutils</module> @@ -499,11 +499,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-2.0.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-2.0.1 + scm:svn:http://svn.nuiton.org/svn/jrst/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-2.0.1</url> + <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> <distributionManagement>

1 0

r737 - in tags: . jrst-2.0.1
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 15:38:36 +0200 (Mon, 02 Jul 2012) New Revision: 737 Url: http://nuiton.org/repositories/revision/jrst/737 Log: [maven-release-plugin] copy for tag jrst-2.0.1 Added: tags/jrst-2.0.1/ Property changes on: tags/jrst-2.0.1 ___________________________________________________________________ Added: svn:ignore + target .settings .classpath .project *.iml Added: svn:mergeinfo + /branches/jrst-docutils-jython:642-706

1 0

r736 - in trunk: . docutils doxia-module-jrst doxia-module-jrst-legacy jrst jrst-doc jrst-site-util
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 15:38:34 +0200 (Mon, 02 Jul 2012) New Revision: 736 Url: http://nuiton.org/repositories/revision/jrst/736 Log: [maven-release-plugin] prepare release jrst-2.0.1 Modified: trunk/docutils/pom.xml trunk/doxia-module-jrst-legacy/pom.xml trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst-site-util/pom.xml trunk/jrst/pom.xml trunk/pom.xml Modified: trunk/docutils/pom.xml =================================================================== (Binary files differ) Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2012-07-02 13:35:16 UTC (rev 735) +++ trunk/doxia-module-jrst/pom.xml 2012-07-02 13:38:34 UTC (rev 736) @@ -21,9 +21,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -34,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/doxia-module-jrst-legacy/pom.xml =================================================================== --- trunk/doxia-module-jrst-legacy/pom.xml 2012-07-02 13:35:16 UTC (rev 735) +++ trunk/doxia-module-jrst-legacy/pom.xml 2012-07-02 13:38:34 UTC (rev 736) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2012-07-02 13:35:16 UTC (rev 735) +++ trunk/jrst/pom.xml 2012-07-02 13:38:34 UTC (rev 736) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2012-07-02 13:35:16 UTC (rev 735) +++ trunk/jrst-doc/pom.xml 2012-07-02 13:38:34 UTC (rev 736) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/jrst-site-util/pom.xml =================================================================== --- trunk/jrst-site-util/pom.xml 2012-07-02 13:35:16 UTC (rev 735) +++ trunk/jrst-site-util/pom.xml 2012-07-02 13:38:34 UTC (rev 736) @@ -21,9 +21,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -34,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> </parent> <groupId>org.nuiton.jrst</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-02 13:35:16 UTC (rev 735) +++ trunk/pom.xml 2012-07-02 13:38:34 UTC (rev 736) @@ -20,9 +20,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -36,7 +34,7 @@ </parent> <artifactId>jrst</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> <modules> <module>docutils</module> @@ -501,11 +499,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-2.0.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jrst/trunk + scm:svn:http://svn.nuiton.org/svn/jrst/tags/jrst-2.0.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jrst/tags/jrst-2.0.1</url> </scm> <distributionManagement>

1 0

r735 - trunk
by maven-release＠users.nuiton.org July 2, 2012

July 2, 2012

Author: maven-release Date: 2012-07-02 15:35:16 +0200 (Mon, 02 Jul 2012) New Revision: 735 Url: http://nuiton.org/repositories/revision/jrst/735 Log: do not build jrst maven plugin (does not work with maven-plugin-plugin 3.0) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-02 13:17:24 UTC (rev 734) +++ trunk/pom.xml 2012-07-02 13:35:16 UTC (rev 735) @@ -518,7 +518,7 @@ <profiles>  <profile> - <id>extra-modules</id> + <id>extra-modules-deprecated</id> <modules> <module>maven-jrst-plugin</module>

1 0

r734 - in trunk: jrst jrst-site-util
by tchemit＠users.nuiton.org July 2, 2012

July 2, 2012

Author: tchemit Date: 2012-07-02 15:17:24 +0200 (Mon, 02 Jul 2012) New Revision: 734 Url: http://nuiton.org/repositories/revision/jrst/734 Log: optimize dependencies Modified: trunk/jrst-site-util/pom.xml trunk/jrst/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2012-07-02 13:01:01 UTC (rev 733) +++ trunk/jrst/pom.xml 2012-07-02 13:17:24 UTC (rev 734) @@ -80,10 +80,10 @@ <artifactId>jaxx-runtime</artifactId> </dependency> - <dependency> +  <dependency> <groupId>commons-lang</groupId> Modified: trunk/jrst-site-util/pom.xml =================================================================== --- trunk/jrst-site-util/pom.xml 2012-07-02 13:01:01 UTC (rev 733) +++ trunk/jrst-site-util/pom.xml 2012-07-02 13:17:24 UTC (rev 734) @@ -55,12 +55,22 @@ </exclusions> </dependency> - <dependency> +  + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> </dependency>

1 0

r733 - trunk/maven-jrst-plugin
by tchemit＠users.nuiton.org July 2, 2012

July 2, 2012

Author: tchemit Date: 2012-07-02 15:01:01 +0200 (Mon, 02 Jul 2012) New Revision: 733 Url: http://nuiton.org/repositories/revision/jrst/733 Log: fix pom before release Modified: trunk/maven-jrst-plugin/pom.xml Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2012-07-02 12:49:19 UTC (rev 732) +++ trunk/maven-jrst-plugin/pom.xml 2012-07-02 13:01:01 UTC (rev 733) @@ -52,7 +52,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> </dependency> <dependency> @@ -135,7 +135,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5.1</version> + <version>${pluginPluginVersion}</version> </plugin> </plugins>

1 0

r732 - trunk/jrst-site-util/src/main/java/org/nuiton/jrst
by tchemit＠users.nuiton.org July 2, 2012

July 2, 2012

Author: tchemit Date: 2012-07-02 14:49:19 +0200 (Mon, 02 Jul 2012) New Revision: 732 Url: http://nuiton.org/repositories/revision/jrst/732 Log: refs #2139: Improve RST generation mecanism (rewrite pdf generation from maven site) Modified: trunk/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java trunk/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java Modified: trunk/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java =================================================================== --- trunk/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java 2012-07-02 10:18:35 UTC (rev 731) +++ trunk/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java 2012-07-02 12:49:19 UTC (rev 732) @@ -106,19 +106,20 @@ mavenProject.getBasedir(), "target" + File.separator + "generated-jrst"); - sourceFile = new File(temporayDirectory, renderingContext.getInputName()); + sourceFile = new File(temporayDirectory, + renderingContext.getInputName()); FileUtil.createDirectoryIfNecessary(sourceFile.getParentFile()); - -// // Write the source in a file to use it with JRST -// sourceFile = File.createTempFile(renderingContext.getInputName(), ".rst", -// temporayDirectory); } if (verbose) { - log.info("Copy " + renderingContext.getInputName() + - " to " + sourceFile); + log.info("Transform rst file: " + sourceFile); + if (log.isDebugEnabled()) { + log.info("Copy " + renderingContext.getInputName() + + " to " + sourceFile); + } } + FileWriter fileWriter = new FileWriter(sourceFile); try { IOUtil.copy(source, fileWriter); Modified: trunk/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java =================================================================== --- trunk/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java 2012-07-02 10:18:35 UTC (rev 731) +++ trunk/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java 2012-07-02 12:49:19 UTC (rev 732) @@ -23,11 +23,12 @@ */ package org.nuiton.jrst; +import com.google.common.collect.Maps; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.render.RenderingContext; -import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.site.decoration.Menu; import org.apache.maven.doxia.site.decoration.MenuItem; import org.apache.maven.doxia.siterenderer.DefaultSiteRenderer; @@ -54,7 +55,6 @@ import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -83,8 +83,6 @@ protected boolean pdfGenerationEnabled; - protected Map<String, String> map; - protected boolean verbose; @Requirement(role = Parser.class, hint = "jrst", optional = true) @@ -109,37 +107,45 @@ verbose = getBooleanProperty("site.verbose") || getLogger().isDebugEnabled(); - map = new HashMap<String, String>(); - pdfGenerationEnabled = getBooleanProperty("pdfGenerationEnabled"); super.render(documents, siteRenderingContext, outputDirectory); if (pdfGenerationEnabled) { - if (verbose) { - getLogger().info("Will generate the site pdf."); - } + // Get relative paths of documents from menu definition (from site.xml model) + List<String> relativPathsFromMenu = + getDocumentRelativePathsFromMenu(siteRenderingContext); - // get pdfFilename - String pdfFilename = getStringProperty("pdfFilename"); - if (StringUtils.isBlank(pdfFilename)) { - pdfFilename = DEFAULT_PDF_FILENAME; - } + // Get relatifs map of all documents + Map<String, String> relatifPaths = buildDocMap(documents); - if (!locales.isEmpty() && !locale.equals(locales.get(0))) { - // not default locale, prefix with locale country. - pdfFilename += "_" + locale.getCountry(); + // merge to have documents refs (to be used in pdf template) + List<String> documentRefs = getDocumentRefs(relatifPaths, + relativPathsFromMenu); + + if (CollectionUtils.isEmpty(documentRefs)) { + // no docuemnts to render, skip pdf generation + + if (getLogger().isInfoEnabled()) { + getLogger().info("No document to put in pdf, skip pdf generation."); + } + } else { + String pdfFilename = getPdfFileName(); + + try { + Field i18nField = ReflectUtil.getField(DefaultSiteRenderer.class, "i18n"); + I18N i18n = (I18N) i18nField.get(this); + + renderPdf(i18n, documentRefs, + siteRenderingContext, + outputDirectory, + pdfFilename); + } catch (Exception e) { + getLogger().error("Can't find rst resource to generate pdf documentation", e); + } } - pdfFilename += ".pdf"; - try { - renderPdf(documents, siteRenderingContext, - outputDirectory, - pdfFilename); - } catch (Exception e) { - getLogger().error("Can't find rst resource to generate pdf documentation", e); - } } } @@ -161,127 +167,154 @@ super.renderDocument(writer, renderingContext, context); } - public void renderPdf(Collection<DocumentRenderer> documents, - SiteRenderingContext siteRenderingContext, - File outputDirectory, String pdfFilename) + protected String getPdfFileName() { + // get pdfFilename + String pdfFilename = getStringProperty("pdfFilename"); + if (StringUtils.isBlank(pdfFilename)) { + pdfFilename = DEFAULT_PDF_FILENAME; + } + + if (!locales.isEmpty() && !locale.equals(locales.get(0))) { + // not default locale, prefix with locale country. + pdfFilename += "_" + locale.getCountry(); + } + pdfFilename += ".pdf"; + return pdfFilename; + } + + protected void renderPdf(I18N i18n, + List<String> documentRefs, + SiteRenderingContext siteRenderingContext, + File outputDirectory, + String pdfFilename) throws RendererException, FileNotFoundException, UnsupportedEncodingException { - Context vc = new VelocityContext(); - if (getLogger().isInfoEnabled()) { - getLogger().info("Generate Site Pdf: " + pdfFilename); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Generate Site Pdf: " + pdfFilename); } - vc.put("locale", locale); - vc.put("supportedLocales", locales); + Context vc = preparePdfVelocityContext(i18n, documentRefs); + + // Define the output file + File fileOut = new File(outputDirectory, pdfFilename); + if (verbose) { + getLogger().info("Will generate the site pdf: " + fileOut); + } + try { StringWriter sw = new StringWriter(); - Field velocityField = ReflectUtil.getField(DefaultSiteRenderer.class, "velocity"); + Field velocityField = + ReflectUtil.getField(DefaultSiteRenderer.class, "velocity"); VelocityComponent velocity = (VelocityComponent) velocityField.get(this); VelocityEngine engine = velocity.getEngine(); - Field i18nField = ReflectUtil.getField(DefaultSiteRenderer.class, "i18n"); + String inputEncoding = siteRenderingContext.getInputEncoding(); - I18N i18n = (I18N) i18nField.get(this); + // Aggregate all rst file info one file + //TODO tchemit-2012-06-29 : use a property + engine.mergeTemplate("/META-INF/maven/RstAggregation.vm", inputEncoding, vc, sw); + String fileContent = sw.toString(); + File pdfDoc = new File(outputDirectory, "pdfDoc.rst"); + FileUtils.writeStringToFile(pdfDoc, fileContent, inputEncoding); - String inputEncoding = siteRenderingContext.getInputEncoding(); - // Set velocity variables - String tableOfContent = i18n.getString("jrst-site-renderer", locale, "content"); - String docName = mavenProject.getName(); - String titleDecoration = StringUtils.rightPad("", docName.length(), '='); - vc.put("titleDecoration", titleDecoration); - vc.put("docName", docName); - vc.put("tableContentName", tableOfContent); + Document doc = jrstParser.getStrategy().generateRstToXml( + fileOut, inputEncoding); - // Build the map of html documents from .rst or .rst.vm files - File basedir = buildDocMap(documents); - vc.put("basedir", basedir.getAbsolutePath()); - vc.put("separator", File.separatorChar); + // Generate the pdf file + JRST.generatePdf(pdfDoc, fileOut, JRST.Overwrite.ALLTIME, doc); - // Build the list of item's href - DecorationModel decoration = siteRenderingContext.getDecoration(); - List<Menu> menus = decoration.getMenus(); - Collection<String> paths = new LinkedList<String>(); - for (Menu menu : menus) { - List<MenuItem> items = menu.getItems(); - for (MenuItem item : items) { - buildListPaths(item, paths, siteRenderingContext); - } - } + } catch (Exception e) { + getLogger().error("Can't generate pdf documentation of the project at " + fileOut, e); + } + } - // Merge of the map of html file and the list of paths - List<String> documentRefs = mergeListAndMap(paths); - if (documentRefs.size() > 0) { - vc.put("documentRefs", documentRefs); + protected Context preparePdfVelocityContext(I18N i18n, + List<String> documentRefs) { - // Aggregate all rst file info one file - //TODO tchemit-2012-06-29 : use a property - engine.mergeTemplate("/META-INF/maven/RstAggregation.vm", inputEncoding, vc, sw); - String fileContent = sw.toString(); - File pdfDoc = new File(outputDirectory, "pdfDoc.rst"); - FileUtils.writeStringToFile(pdfDoc, fileContent, inputEncoding); + Context vc = new VelocityContext(); + vc.put("locale", locale); + vc.put("supportedLocales", locales); + String tableOfContent = i18n.getString("jrst-site-renderer", locale, "content"); + String docName = mavenProject.getName(); + String titleDecoration = StringUtils.rightPad("", docName.length(), '='); + vc.put("titleDecoration", titleDecoration); + vc.put("docName", docName); + vc.put("tableContentName", tableOfContent); - // Define the output file - File fileOut = new File(outputDirectory, pdfFilename); + // Build the map of html documents from .rst or .rst.vm files - Document doc = jrstParser.getStrategy().generateRstToXml( - fileOut, inputEncoding); + vc.put("basedir", mavenProject.getBasedir()); + vc.put("separator", File.separatorChar); + vc.put("documentRefs", documentRefs); + return vc; + } - // Generate the pdf file - JRST.generatePdf(pdfDoc, fileOut, JRST.Overwrite.ALLTIME, doc); + protected List<String> getDocumentRelativePathsFromMenu(SiteRenderingContext siteRenderingContext) { + List<String> paths = new LinkedList<String>(); + for (Menu menu : siteRenderingContext.getDecoration().getMenus()) { + for (MenuItem item : menu.getItems()) { + buildListPathsFromMenuItem(item, paths); } + } + return paths; + } - } catch (Exception e) { - getLogger().error("Can't generate pdf documentation of the project", e); + protected List<String> getDocumentRefs(Map<String, String> relatifPaths, + List<String> relativPathsFromMenu) { + + // Merge the map and the list to obtain a list of rst files we can add in the pdf + List<String> documentRefs = new LinkedList<String>(); + for (String path : relativPathsFromMenu) { + // Seek in the hashmap if the rst file exists to add it in the doc list + String rstFilename = relatifPaths.get(path); + if (rstFilename != null) { + if (verbose) { + getLogger().info("Add document to render in pdf: " + + rstFilename); + } + documentRefs.add(rstFilename); + } } + return documentRefs; } - public File buildDocMap(Collection<DocumentRenderer> documents) { - File basedir = new File("."); + protected Map<String, String> buildDocMap(Collection<DocumentRenderer> documents) { + + Map<String, String> map = Maps.newTreeMap(); + for (DocumentRenderer doc : documents) { RenderingContext renderingContext = doc.getRenderingContext(); String inputName = renderingContext.getInputName(); - String relativeDir = renderingContext.getRelativePath(); +// String relativeDir = renderingContext.getRelativePath(); if (inputName.endsWith("rst") || inputName.endsWith("rst.vm")) { // Change the extension to html String[] splitName = inputName.split("\\."); String htmlName = splitName[0] + "." + "html"; String relativePath = "." + File.separator + htmlName; - if (getLogger().isInfoEnabled()) { - getLogger().info("relativePath: " + relativePath); + if (getLogger().isDebugEnabled()) { + getLogger().debug("relativePath: " + relativePath); } - // Add in a hashmap + // Add in map map.put(relativePath, inputName); - if (relativeDir.equals(".") && inputName.startsWith("index")) { - basedir = renderingContext.getBasedir(); - } + //TODO Why ? +// if (relativeDir.equals(".") && inputName.startsWith("index")) { +// basedir = renderingContext.getBasedir(); +// } } } - return basedir; + return map; } - public List<String> mergeListAndMap(Collection<String> paths) { - // Merge the map and the list to obtain a list of rst files we can add in the pdf - List<String> documentRefs = new LinkedList<String>(); - for (String path : paths) { - // Seek in the hashmap if the rst file exists to add it in the doc list - String rstFilename = map.get(path); - if (rstFilename != null) { - documentRefs.add(rstFilename); - } - } - return documentRefs; - } - - public Collection<String> buildListPaths(MenuItem item, Collection<String> paths, - SiteRenderingContext siteRenderingContext) { + protected Collection<String> buildListPathsFromMenuItem(MenuItem item, + Collection<String> paths) { // add hrefs to paths if they don't start with "http" or ".." String href = item.getHref(); if (!href.startsWith("http") && !href.startsWith("..")) { boolean addHref = true; - for (Locale loc : siteRenderingContext.getSiteLocales()) { + for (Locale loc : locales) { if (href.startsWith(loc.toString())) { addHref = false; } @@ -290,8 +323,8 @@ if (!href.startsWith("./")) { href = "./" + href; } - if (getLogger().isInfoEnabled()) { - getLogger().info("xml: " + href); + if (getLogger().isDebugEnabled()) { + getLogger().debug("document to render in pdf: " + href); } paths.add(href); } @@ -300,15 +333,16 @@ List<MenuItem> subItems = item.getItems(); if (!subItems.isEmpty()) { for (MenuItem subItem : subItems) { - paths = buildListPaths(subItem, paths, siteRenderingContext); + paths = buildListPathsFromMenuItem(subItem, paths); } } return paths; } protected String getStringProperty(String propertyName) { - String value = String.valueOf(mavenProject.getModel().getProperties().get(propertyName)); - return value; + Object value = mavenProject.getProperties().get(propertyName); + String result = value == null ? null : String.valueOf(value); + return result; } protected boolean getBooleanProperty(String propertyName) {

1 0

r731 - in trunk: . jrst jrst/src/main/java/org/nuiton/jrst/ui jrst/src/main/resources jrst/src/main/resources/icons
by tchemit＠users.nuiton.org July 2, 2012

July 2, 2012

Author: tchemit Date: 2012-07-02 12:18:35 +0200 (Mon, 02 Jul 2012) New Revision: 731 Url: http://nuiton.org/repositories/revision/jrst/731 Log: refs #2130 : down to jaxx 2.4.2 Added: trunk/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditor.jaxx trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java trunk/jrst/src/main/resources/icons/ trunk/jrst/src/main/resources/icons/action-open.png Modified: trunk/jrst/pom.xml trunk/jrst/src/main/java/org/nuiton/jrst/ui/JRSTView.jaxx trunk/jrst/src/main/java/org/nuiton/jrst/ui/XslPanel.jaxx trunk/pom.xml Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2012-06-29 23:56:47 UTC (rev 730) +++ trunk/jrst/pom.xml 2012-07-02 10:18:35 UTC (rev 731) @@ -215,7 +215,7 @@ <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-maven-plugin</artifactId> + <artifactId>maven-jaxx-plugin</artifactId> <executions> <execution> <goals> Added: trunk/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java (rev 0) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java 2012-07-02 10:18:35 UTC (rev 731) @@ -0,0 +1,79 @@ +/* + * #%L + * JAXX :: Widgets + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 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>. + * #L% + */ +package org.nuiton.jrst.ui; + +import javax.swing.JPanel; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +/** + * TODO sletellier 15/06/2012 : find a better way to add onActionPerform on custom components + * + * @author sletellier <letellier(a)codelutin.com> + */ +public abstract class BaseActionPanel + extends JPanel { + + /** + * Notifies all listeners that have registered interest for + * notification on this event type. + * + * @see javax.swing.event.EventListenerList + */ + protected void fireActionEvent() { + ActionEvent e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "actionPerformed"); + + // Guaranteed to return a non-null array + Object[] listeners = listenerList.getListenerList(); + // Process the listeners last to first, notifying + // those that are interested in this event + for (Object listener : listeners) { + if (ActionListener.class.isInstance(listener)) { + ((ActionListener) listener).actionPerformed(e); + } + } + } + + /** + * Adds an <code>ActionListener</code>. + * <p/> + * The <code>ActionListener</code> will receive an <code>ActionEvent</code> + * when a selection has been made. If the combo box is editable, then + * an <code>ActionEvent</code> will be fired when editing has stopped. + * + * @param l the <code>ActionListener</code> that is to be notified + */ + public void addActionListener(ActionListener l) { + listenerList.add(ActionListener.class, l); + } + + /** + * Removes an <code>ActionListener</code>. + * + * @param l the <code>ActionListener</code> to remove + */ + public void removeActionListener(ActionListener l) { + listenerList.remove(ActionListener.class, l); + } +} Added: trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditor.jaxx =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditor.jaxx (rev 0) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditor.jaxx 2012-07-02 10:18:35 UTC (rev 731) @@ -0,0 +1,77 @@ + +<BaseActionPanel layout='{new BorderLayout()}'> + <import> + java.io.File + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener + </import> +  + + <FileEditorHandler id='handler' constructorParams='this'/> + + <Boolean id='acceptAllFileFilterUsed' javaBean='Boolean.TRUE'/> + + <Boolean id='directoryEnabled' javaBean='Boolean.TRUE'/> + + <Boolean id='fileEnabled' javaBean='Boolean.TRUE'/> + + <File id='selectedFile' javaBean='null'/> + + <String id='startPath' javaBean='null'/> + + <String id='title' javaBean='null'/> + + <String id='exts' javaBean='null'/> + + <String id='extsDescription' javaBean='null'/> + + <script><![CDATA[ + protected void $afterCompleteSetup() { + + addPropertyChangeListener(PROPERTY_SELECTED_FILE, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (selectedFile != null) { + pathField.setText(selectedFile.getAbsolutePath()); + fireActionEvent(); + } + } + }); + } + ]]></script> + + <JTextField id='pathField' + constraints='BorderLayout.CENTER' + enabled='{isEnabled()}' + text='{getStartPath()}' + onFocusLost='setSelectedFile(new File(pathField.getText()))'/> + + <JButton id='boutonXslLocation' + constraints='BorderLayout.EAST' + enabled='{isEnabled()}' + actionIcon='open' + onActionPerformed='handler.openLocation()'/> +</BaseActionPanel> \ No newline at end of file Added: trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java (rev 0) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java 2012-07-02 10:18:35 UTC (rev 731) @@ -0,0 +1,149 @@ +/* + * #%L + * JAXX :: Widgets + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2008 - 2012 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>. + * #L% + */ +package org.nuiton.jrst.ui; + +import com.google.common.io.Files; + +import javax.swing.*; +import javax.swing.filechooser.FileFilter; +import java.io.File; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class FileEditorHandler { + + public static final String SEPARATOR_REGEX = "\\s*,\\s*"; + protected FileEditor view; + + public FileEditorHandler(FileEditor view) { + this.view = view; + } + + public void openLocation() { + + // use last selected file + File startFile = view.getSelectedFile(); + String startPath = view.getStartPath(); + if (startFile == null && startPath != null) { + + + // else filed start path + startFile = new File(startPath); + } else { + + // else start with user home + startFile = new File(System.getProperty("user.home")); + } + JFileChooser fc = new JFileChooser(startFile); + + fc.setDialogTitle(view.getTitle()); + fc.setAcceptAllFileFilterUsed(view.getAcceptAllFileFilterUsed()); + + // TODO sletellier 14/06/2012 : activate multi selection +// boolean multiSelectionEnabled = view.isMultiSelectionEnabled(); +// fc.setMultiSelectionEnabled(multiSelectionEnabled); + + // used to enable directory selection + boolean directoryEnabled = view.isDirectoryEnabled(); + if (directoryEnabled) { + fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + } + + // used to enable file selection + boolean fileEnabled = view.isFileEnabled(); + if (fileEnabled) { + + if (directoryEnabled) { + + // both + fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); + } else { + fc.setFileSelectionMode(JFileChooser.FILES_ONLY); + } + String extsAsString = view.getExts(); + if (extsAsString != null) { + + // extentions can be separted by comma + String[] exts = extsAsString.split(SEPARATOR_REGEX); + String extsDescription = view.getExtsDescription(); + + String[] descs = new String[0]; + if (extsDescription != null) { + descs = extsDescription.split(SEPARATOR_REGEX); + } + for (int i = 0;i<exts.length;i++) { + + // use ext if no desc found + String ext = exts[i]; + String desc = ext; + if (descs.length > i) { + desc = descs[i]; + } + + fc.addChoosableFileFilter(new ExtentionFileFiler(ext, desc)); + } + } + } + + // directory or/and file must be enabled + if (!directoryEnabled && !fileEnabled) { + throw new IllegalArgumentException("You must enable at least file or directory to open dialog"); + } + + // show dialog + int returnVal = fc.showOpenDialog(view); + if (returnVal == JFileChooser.APPROVE_OPTION) { + + // get selected to display in ui + File file = fc.getSelectedFile(); + + view.setSelectedFile(file); + } + } + + public static class ExtentionFileFiler extends FileFilter { + protected String ext; + protected String desciption; + + public ExtentionFileFiler(String ext, String desciption) { + this.ext = ext; + this.desciption = desciption; + } + + @Override + public boolean accept(File file) { + if (file.isDirectory()) { + return true; + } + String fileExtension = Files.getFileExtension(file.getName()); + return ext.equals(fileExtension); + } + + @Override + public String getDescription() { + return desciption; + } + } +} Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ui/JRSTView.jaxx =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ui/JRSTView.jaxx 2012-06-29 23:56:47 UTC (rev 730) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ui/JRSTView.jaxx 2012-07-02 10:18:35 UTC (rev 731) @@ -33,8 +33,8 @@ java.awt.Dimension org.nuiton.jrst.JRST org.nuiton.util.Resource - jaxx.runtime.swing.editor.FileEditor </import> +  <JRSTViewHandler id='handler' constructorParams='this'/> Modified: trunk/jrst/src/main/java/org/nuiton/jrst/ui/XslPanel.jaxx =================================================================== --- trunk/jrst/src/main/java/org/nuiton/jrst/ui/XslPanel.jaxx 2012-06-29 23:56:47 UTC (rev 730) +++ trunk/jrst/src/main/java/org/nuiton/jrst/ui/XslPanel.jaxx 2012-07-02 10:18:35 UTC (rev 731) @@ -26,8 +26,8 @@ <import> java.awt.Dimension org.nuiton.util.Resource - jaxx.runtime.swing.editor.FileEditor </import> +  <Integer id='panelNumber' javaBean='0'/> <JRSTCommandModel id='model' javaBean='getContextValue(JRSTCommandModel.class)'/> Added: trunk/jrst/src/main/resources/icons/action-open.png =================================================================== (Binary files differ) Property changes on: trunk/jrst/src/main/resources/icons/action-open.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-29 23:56:47 UTC (rev 730) +++ trunk/pom.xml 2012-07-02 10:18:35 UTC (rev 731) @@ -463,7 +463,7 @@ <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xalanVersion>2.7.1</xalanVersion> - <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.4.2</jaxxVersion> </properties> @@ -480,7 +480,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-maven-plugin</artifactId> + <artifactId>maven-jaxx-plugin</artifactId> <version>${jaxxVersion}</version> </plugin>

1 0