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

r227 - maven-jrst-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 21:57:21 +0000 (Wed, 08 Oct 2008) New Revision: 227 Modified: maven-jrst-plugin/trunk/changelog maven-jrst-plugin/trunk/pom.xml Log: go in snapshot before next release :) Modified: maven-jrst-plugin/trunk/changelog =================================================================== --- maven-jrst-plugin/trunk/changelog 2008-10-08 21:56:01 UTC (rev 226) +++ maven-jrst-plugin/trunk/changelog 2008-10-08 21:57:21 UTC (rev 227) @@ -1,4 +1,5 @@ ver-0-8-3 thimel 200810XX + * 20081008 [chemit] refactor plugin to generate ony when required * 20081008 [chemit] Using lutinpluginproject 3.0 in a better way :) * 20081008 [chemit] add log4j.properties * 20081008 [chemit] use a DirectoryScanner instead of FileAction since we do not want to parse scm admin files... Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2008-10-08 21:56:01 UTC (rev 226) +++ maven-jrst-plugin/trunk/pom.xml 2008-10-08 21:57:21 UTC (rev 227) @@ -35,7 +35,7 @@   <name>Plugin maven JRst</name> - <version>0.8.2</version> + <version>0.8.2-SNAPSHOT</version> <description> Plugin pour maven2 pour la génération de xdoc à partir de fichiers RST. </description>

1 0

r226 - maven-jrst-plugin/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 21:56:01 +0000 (Wed, 08 Oct 2008) New Revision: 226 Modified: maven-jrst-plugin/trunk/src/site/site.xml Log: dummy entries... Modified: maven-jrst-plugin/trunk/src/site/site.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site.xml 2008-10-08 21:51:46 UTC (rev 225) +++ maven-jrst-plugin/trunk/src/site/site.xml 2008-10-08 21:56:01 UTC (rev 226) @@ -34,16 +34,12 @@ <menu ref="parent"/> <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> - <item name="Détail goals" href="plugin-info.html"> - <item name="jrst" href="jrst-mojo.html"/> - <item name="help" href="help-mojo.html"/> + <item name="Détail des goals" href="plugin-info.html"> + <item name="jrst:jrst" href="jrst-mojo.html"/> + <item name="jrst:help" href="help-mojo.html"/> </item> </menu> - <menu name="Detail goals"> - <item name="generate" href="generate-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </menu> - + <menu name="Téléchargement"> <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" name="Télécharger la dernière version"/>

1 0

r225 - jrst/trunk
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 21:51:46 +0000 (Wed, 08 Oct 2008) New Revision: 225 Modified: jrst/trunk/pom.xml Log: add site locales + remove dependencies (coming from superpom) Modified: jrst/trunk/pom.xml =================================================================== --- jrst/trunk/pom.xml 2008-10-08 21:49:14 UTC (rev 224) +++ jrst/trunk/pom.xml 2008-10-08 21:51:46 UTC (rev 225) @@ -35,14 +35,15 @@  <maven.test.skip>true</maven.test.skip> + + <maven.site.locales>fr,en</maven.site.locales> </properties>  <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> -  + <url>${maven.scm.url}</url> </scm> <build> @@ -79,12 +80,6 @@  <dependencies> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.4</version> @@ -133,12 +128,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> <version>1.1.1</version>

1 0

r224 - jrst/trunk/src/site
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 21:49:14 +0000 (Wed, 08 Oct 2008) New Revision: 224 Modified: jrst/trunk/src/site/site_en.xml jrst/trunk/src/site/site_fr.xml Log: empty xml tags Modified: jrst/trunk/src/site/site_en.xml =================================================================== --- jrst/trunk/src/site/site_en.xml 2008-10-08 21:42:51 UTC (rev 223) +++ jrst/trunk/src/site/site_en.xml 2008-10-08 21:49:14 UTC (rev 224) @@ -32,9 +32,9 @@ </links> <menu name="User"> - <item href="/user/index.html" name="About"></item> - <item href="/user/RSTpresentation.html" name="A ReStructuredText Primer"></item> - <item href="/user/functionality.html" name="Functionalities suggested"></item> + <item href="/user/index.html" name="About"/> + <item href="/user/RSTpresentation.html" name="A ReStructuredText Primer"/> + <item href="/user/functionality.html" name="Functionalities suggested"/> <item href="http://labs.libre-entreprise.org/frs/?group_id=54&release_id=252" name="download"/> </menu> Modified: jrst/trunk/src/site/site_fr.xml =================================================================== --- jrst/trunk/src/site/site_fr.xml 2008-10-08 21:42:51 UTC (rev 223) +++ jrst/trunk/src/site/site_fr.xml 2008-10-08 21:49:14 UTC (rev 224) @@ -32,9 +32,9 @@ </links> <menu name="Utilisateur"> - <item href="/user/index.html" name="Présentation du JRST"></item> - <item href="/user/presentationRST.html" name="Introduction à ReStructuredText"></item> - <item href="/user/fonctionnalites.html" name="Fonctionnalités incluses"></item> + <item href="/user/index.html" name="Présentation du JRST"/> + <item href="/user/presentationRST.html" name="Introduction à ReStructuredText"/> + <item href="/user/fonctionnalites.html" name="Fonctionnalités incluses"/> <item href="http://labs.libre-entreprise.org/frs/?group_id=54&release_id=252" name="Télécharger"/> </menu>

1 0

r223 - in maven-jrst-plugin/trunk: . src/main/java/org/codelutin/jrst/plugin
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 21:42:51 +0000 (Wed, 08 Oct 2008) New Revision: 223 Modified: maven-jrst-plugin/trunk/pom.xml maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java Log: introduce updater idiom in the plugin (only generate if required) introduce property force to force generation introduce property resourceDirectoryOut : where to copy resources Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2008-10-08 15:18:59 UTC (rev 222) +++ maven-jrst-plugin/trunk/pom.xml 2008-10-08 21:42:51 UTC (rev 223) @@ -23,13 +23,19 @@ <version>[0.8,)</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> </dependencies>    <name>Plugin maven JRst</name> - <version>0.8.2-SNAPHSOT</version> + <version>0.8.2</version> <description> Plugin pour maven2 pour la génération de xdoc à partir de fichiers RST. </description> Modified: maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2008-10-08 15:18:59 UTC (rev 222) +++ maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2008-10-08 21:42:51 UTC (rev 223) @@ -33,8 +33,11 @@ import org.apache.maven.plugin.MojoExecutionException; import org.codehaus.plexus.util.DirectoryScanner; import org.codelutin.jrst.JRST; +import org.codelutin.util.FileUtil; +import org.codelutin.util.MirroredFileUpdater; import java.io.File; +import java.io.IOException; /** * Génére du xdoc à partir de fichiers Rst. @@ -58,7 +61,16 @@ * @phase pre-site */ public class JRstPlugin extends AbstractMojo { - //implements FileAction { + + /** La liste des ressource a copier si rien n'est specifie via la propriete includeResources */ + protected static final String[] DEFAULT_INCLUDE_RESOURCES = { + "**\\/*.png", + "**\\/*.jpeg", + "**\\/*.jpg", + "**\\/*.gif" + }; + + /** * Répertoire source des fichiers Rst * @@ -90,6 +102,14 @@ protected File directoryOut; /** + * Répertoire cible des fichiers resources générée + * + * @parameter default-value="target/generated-site/resources" + * @required + */ + protected File resourceDirectoryOut; + + /** * Arréte la génération en cas d'erreurs * * @parameter default-value="true" @@ -103,7 +123,11 @@ */ protected String overwrite = "ifnewer"; - /** @parameter default-value="fr" */ + /** + * La locale par defaut a utiliser. + * + * @parameter default-value="fr" + */ protected String defaultLocale = "fr"; /** @@ -113,8 +137,22 @@ */ protected boolean verbose; + /** + * Flag pour forcer la generation des rst et la copie des resources. + * + * @parameter expression="${jrst.force}" default-value="false" + */ + protected boolean force; + + /** + * La liste des ressources a recopier + * + * @parameter expression="${jrst.includeResources}" + */ + protected String[] includeResources; + /** Number of generated files. */ - private int numberFilesGenerates; + protected int numberFilesGenerates; /** * Retourne la langue par defaut precisé dans le pom.xml @@ -141,102 +179,141 @@ try { actionGenerate(); } catch (GenerationJRstException e) { - System.out.println("Error during generation for :\n" + getLog().error("Error during generation for :\n" + GenerationJRstException.getFilesErrors()); if (!ignoreErrors) { throw new MojoExecutionException("Erreur lors de l'execution"); } } - //actionCopy(); + actionCopy(); } private void actionGenerate() { getLog().info("Génération des fichier xdocs à partir des fichiers rst"); + + MirroredFileUpdater rstUpdater = new RstUpdater(directoryIn, directoryOut, defaultLocale); + numberFilesGenerates = 0; - DirectoryScanner ds; - ds = new DirectoryScanner(); + DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(directoryIn); ds.setIncludes(new String[]{"**\\/*.rst"}); - ds.scan(); String[] files = ds.getIncludedFiles(); for (String file : files) { - doAction(new File(directoryIn, file)); + File in = new File(directoryIn, file); + + if (!force && rstUpdater.isFileUpToDate(in)) { + if (verbose) { + getLog().info("skip up-to-date rst file : " + in); + } + continue; + } + + doAction(in, rstUpdater.getMirrorFile(in)); } - //FileUtil.walkAfter(new File(directoryIn), this); - getLog().info( - "Generating " + numberFilesGenerates + " files to " - + directoryOut); + getLog().info("Generating " + numberFilesGenerates + " files to " + directoryOut); } - public boolean doAction(File file) { - String fileIn = file.getAbsoluteFile().toString(); - String fileOut = null; - getLog().info("Using " + fileIn); - if (fileIn.matches(".*[/\\\\]rst[/\\\\].*\\.rst")) { - fileOut = fileIn.replace(directoryIn.getAbsolutePath(), directoryOut.getAbsolutePath()).replace(".rst", - ".xml").replaceFirst("([/\\\\])rst([/\\\\])", "$1xdoc$2"); + public boolean doAction(File in, File out) { - if (defaultLocale != null && !"".equals(defaultLocale)) { - fileOut = fileOut.replaceFirst("([/\\\\])" + defaultLocale - + "([/\\\\])", "$1"); - } + getLog().info("Using " + in); - try { - JRST.generate(JRST.TYPE_XDOC, new File(fileIn), inputEncoding, - new File(fileOut), outputEncoding, getOverwrite()); - numberFilesGenerates++; - } catch (Exception e) { - getLog().error(e); - if (!ignoreErrors) { - throw new GenerationJRstException(fileIn); - } + try { + JRST.generate(JRST.TYPE_XDOC, in, inputEncoding, + out, outputEncoding, getOverwrite()); + numberFilesGenerates++; + } catch (Exception e) { + getLog().error(e); + if (!ignoreErrors) { + throw new GenerationJRstException(in.getAbsolutePath()); } } - if (fileOut != null && verbose) { - getLog().info("Using " + fileIn); - getLog().info("Generating " + fileOut); + if (out != null && verbose) { + //getLog().info("Using " + fileIn); + getLog().info("Generating " + out); } return true; } - /*protected void actionCopy() { + protected void actionCopy() { getLog().info("Copie des fichiers images"); - // Execution de la tâche ant copy - try { + MirroredFileUpdater resourceUpdater = new RessourceUpdater(directoryIn, resourceDirectoryOut, defaultLocale); + + DirectoryScanner ds = new DirectoryScanner(); + ds.setBasedir(directoryIn); + ds.setIncludes(includeResources == null || includeResources.length == 0 ? DEFAULT_INCLUDE_RESOURCES : includeResources); + ds.scan(); + + for (String file : ds.getIncludedFiles()) { + File in = new File(directoryIn, file); + if (!force && resourceUpdater.isFileUpToDate(in)) { + if (verbose) { + getLog().info("skip up-to-date resource file : " + in); + } + // do not copy the resource + continue; + } + File out = resourceUpdater.getMirrorFile(in); + if (verbose) { + getLog().info("copy resource " + in + " to " + out); + } + try { + FileUtil.copy(in, out); + } catch (IOException e) { + getLog().error(e); + } + } + } + + /** + * An updater for rst files + * + * @author chemit + */ + protected static class RstUpdater extends MirroredFileUpdater { + + protected String defaultLocale; + + protected RstUpdater(File sourceDirectory, File destinationDirectory, String defaultLocale) { + super(sourceDirectory, destinationDirectory); + this.defaultLocale = defaultLocale; + } + + public File getMirrorFile(File f) { + String file = f.getAbsolutePath().substring(prefixSourceDirecotory); + file = file.replace(".rst", ".xml").replaceFirst("([/\\\\])rst([/\\\\])", "$1xdoc$2"); if (defaultLocale != null && !"".equals(defaultLocale)) { - // copie de tous les fichiers non rst - FileUtil.copyAndRenameRecursively(directoryIn, - directoryOut, false, "([/\\\\])" - + defaultLocale + "([/\\\\])", "$1", true, - ".*[/\\\\]rst[/\\\\].*"); + file = file.replaceFirst("([/\\\\])" + defaultLocale + "([/\\\\])", "$1"); + } + return new File(destinationDirectory, file); + } + } - // copie des images du repertoire rst dans le build-site - FileUtil.copyAndRenameRecursively( - directoryIn, - directoryOut, - false, // on ne copie que le contenu de directoryIn - "([/\\\\])" + defaultLocale + "([/\\\\])rst([/\\\\])", - "$1resources$2", false, - ".*[/\\\\]rst[/\\\\].*(\\.png|\\.jpeg|\\.jpg|\\.gif)$"); - } else { - // copie de tous les fichiers non rst - FileUtil.copyAndRenameRecursively(directoryIn, - directoryOut, false, "", "", true, - ".*[/\\\\]rst[/\\\\].*"); + /** + * An updater for resources files + * + * @author chemit + */ + protected static class RessourceUpdater extends MirroredFileUpdater { - // copie des images du repertoire rst dans le build-site - FileUtil.copyAndRenameRecursively(directoryIn, - directoryOut, false, "([/\\\\])rst([/\\\\])", - "$1resources$2", false, - ".*[/\\\\]rst[/\\\\].*(\\.png|\\.jpeg|\\.jpg|\\.gif)$"); + protected String defaultLocale; + + protected RessourceUpdater(File sourceDirectory, File destinationDirectory, String defaultLocale) { + super(sourceDirectory, destinationDirectory); + this.defaultLocale = defaultLocale; + } + + public File getMirrorFile(File f) { + String file = f.getAbsolutePath().substring(prefixSourceDirecotory); + file = file.replaceFirst("([/\\\\])rst([/\\\\])", "$1$2"); + if (defaultLocale != null && !"".equals(defaultLocale)) { + file = file.replaceFirst("([/\\\\])" + defaultLocale + "([/\\\\])", "$1"); } - } catch (IOException eee) { - getLog().error(eee); + return new File(destinationDirectory, file); } - }*/ + } }

1 0

r222 - in maven-jrst-plugin/trunk: . src/site src/site/fr src/site/fr/rst
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 15:18:59 +0000 (Wed, 08 Oct 2008) New Revision: 222 Added: maven-jrst-plugin/trunk/src/site/fr/ maven-jrst-plugin/trunk/src/site/fr/rst/ maven-jrst-plugin/trunk/src/site/fr/rst/Todo.rst maven-jrst-plugin/trunk/src/site/fr/rst/index.rst Removed: maven-jrst-plugin/trunk/THIRD-PARTY.txt Modified: maven-jrst-plugin/trunk/changelog maven-jrst-plugin/trunk/pom.xml maven-jrst-plugin/trunk/src/site/site.xml Log: add rst for the site remove third-party file normalized pom Deleted: maven-jrst-plugin/trunk/THIRD-PARTY.txt =================================================================== --- maven-jrst-plugin/trunk/THIRD-PARTY.txt 2008-10-08 15:17:58 UTC (rev 221) +++ maven-jrst-plugin/trunk/THIRD-PARTY.txt 2008-10-08 15:18:59 UTC (rev 222) @@ -1,58 +0,0 @@ -List of third-party dependencies grouped by their license type. - -Common Public License Version 1.0 : - * JUnit (junit:junit:3.8.1 - http://junit.org) - -GPL : - * JRst (lutinlib:jrst:0.8.2-SNAPSHOT - http://labs.libre-entreprise.org/projects/jrst/jrst) - * Lutin utilities library (lutinlib:lutinutil:0.26 - http://labs.libre-entreprise.org/projects/lutinutil/lutinutil) - -LGPL : - * xom (xom:xom:1.0 - http://www.xom.nu) - -The Apache Software License, Version 2.0 : - * Apache XML Graphics Commons (org.apache.xmlgraphics:xmlgraphics-commons:1.1 - http://xmlgraphics.apache.org/commons/) - * Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) - * IO (commons-io:commons-io:1.1 - http://jakarta.apache.org/commons/io/) - * IO (commons-io:commons-io:1.3.1 - http://jakarta.apache.org/commons/io/) - * Lang (commons-lang:commons-lang:2.1 - http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) - * Log4j (log4j:log4j:1.2.14 - http://logging.apache.org/log4j/docs/) - * Logging (commons-logging:commons-logging:1.1 - http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) - * Maven Artifact (org.apache.maven:maven-artifact:2.0.9 - http://maven.apache.org/maven-artifact) - * Maven Artifact Manager (org.apache.maven:maven-artifact-manager:2.0.9 - http://maven.apache.org/maven-artifact-manager) - * Maven Local Settings Model (org.apache.maven:maven-settings:2.0.9 - http://maven.apache.org/maven-settings) - * Maven Model (org.apache.maven:maven-model:2.0.9 - http://maven.apache.org/maven-model) - * Maven Plugin API (org.apache.maven:maven-plugin-api:2.0.9 - http://maven.apache.org/maven-plugin-api) - * Maven Plugin Registry Model (org.apache.maven:maven-plugin-registry:2.0.9 - http://maven.apache.org/maven-plugin-registry) - * Maven Profile Model (org.apache.maven:maven-profile:2.0.9 - http://maven.apache.org/maven-profile) - * Maven Project Builder (org.apache.maven:maven-project:2.0.9 - http://maven.apache.org/maven-project) - * Maven Repository Metadata Model (org.apache.maven:maven-repository-metadata:2.0.9 - http://maven.apache.org/maven-repository-metadata) - * Maven Wagon API (org.apache.maven.wagon:wagon-provider-api:1.0-beta-2 - http://maven.apache.org/wagon/wagon-provider-api) - * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:1.5.1 - http://plexus.codehaus.org/plexus-utils) - * XML Commons External Components XML APIs (xml-apis:xml-apis:1.0.b2 - http://xml.apache.org/commons/#external) - -Unknown license : - * Batik Ext (batik:batik-ext:1.6-1 - no url defined) - * Batik GUI Utilities (batik:batik-gui-util:1.6-1 - no url defined) - * Batik Utilities (batik:batik-util:1.6-1 - no url defined) - * Default Plexus Container (org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1 - no url defined) - * Plexus Common Utilities (org.codehaus.plexus:plexus-utils:1.0.4 - no url defined) - * Unnamed - com.ibm.icu:icu4j:jar:2.6.1 (com.ibm.icu:icu4j:2.6.1 - no url defined) - * Unnamed - commons-collections:commons-collections:jar:3.1 (commons-collections:commons-collections:3.1 - no url defined) - * Unnamed - commons-primitives:commons-primitives:jar:1.0 (commons-primitives:commons-primitives:1.0 - no url defined) - * Unnamed - fop:fop:jar:0.93 (fop:fop:0.93 - no url defined) - * Unnamed - jaxen:jaxen:jar:1.0-FCS (jaxen:jaxen:1.0-FCS - no url defined) - * Unnamed - jdom:jdom:jar:1.0 (jdom:jdom:1.0 - no url defined) - * Unnamed - jewelcli:jewelcli:jar:0.41 (jewelcli:jewelcli:0.41 - no url defined) - * Unnamed - nwalsh:docbook-xsl-nwalsh:jar:1.71.1 (nwalsh:docbook-xsl-nwalsh:1.71.1 - no url defined) - * Unnamed - org.apache.ant:ant-launcher:jar:1.7.0 (org.apache.ant:ant-launcher:1.7.0 - http://ant.apache.org/ant-launcher) - * Unnamed - xalan:xalan:jar:2.6.0 (xalan:xalan:2.6.0 - no url defined) - * Unnamed - xerces:xercesImpl:jar:2.6.2 (xerces:xercesImpl:2.6.2 - no url defined) - * Unnamed - xerces:xmlParserAPIs:jar:2.6.2 (xerces:xmlParserAPIs:2.6.2 - no url defined) - * Unnamed - xml-apis:xml-apis:jar:1.3.02 (xml-apis:xml-apis:1.3.02 - http://xml.apache.org/commons/#external) - * Unnamed - xml-apis:xmlParserAPIs:jar:2.0.2 (xml-apis:xmlParserAPIs:2.0.2 - no url defined) - * classworlds (classworlds:classworlds:1.1-alpha-2 - http://classworlds.codehaus.org/) - * dom4j (dom4j:dom4j:1.6.1 - http://dom4j.org) - * jaxen (jaxen:jaxen:1.1-beta-6 - http://jaxen.codehaus.org/) - * jaxen (jaxen:jaxen:1.1.1 - http://jaxen.codehaus.org/) - * org.apache.tools.ant (org.apache.ant:ant:1.7.0 - http://ant.apache.org/ant) \ No newline at end of file Modified: maven-jrst-plugin/trunk/changelog =================================================================== --- maven-jrst-plugin/trunk/changelog 2008-10-08 15:17:58 UTC (rev 221) +++ maven-jrst-plugin/trunk/changelog 2008-10-08 15:18:59 UTC (rev 222) @@ -1,2 +1,7 @@ +ver-0-8-3 thimel 200810XX + * 20081008 [chemit] Using lutinpluginproject 3.0 in a better way :) + * 20081008 [chemit] add log4j.properties + * 20081008 [chemit] use a DirectoryScanner instead of FileAction since we do not want to parse scm admin files... + ver-0-8-2 thimel 20080922 * 20080922 [thimel] Using lutinpluginproject 3.0 Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2008-10-08 15:17:58 UTC (rev 221) +++ maven-jrst-plugin/trunk/pom.xml 2008-10-08 15:18:59 UTC (rev 222) @@ -2,57 +2,108 @@ <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>lutinpluginproject</artifactId> - <version>3.0</version> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginproject</artifactId> + <version>3.0</version> </parent> -  - <groupId>org.codelutin</groupId> +  <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.2</version> - <packaging>maven-plugin</packaging> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>jrst</artifactId> + <version>[0.8,)</version> + <scope>compile</scope> + </dependency> + </dependencies> -  +  +  +  <name>Plugin maven JRst</name> + <version>0.8.2-SNAPHSOT</version> <description> Plugin pour maven2 pour la génération de xdoc à partir de fichiers RST. </description> - <inceptionYear>2006</inceptionYear> +  +  +  + <packaging>maven-plugin</packaging> + <properties> -  +  <labs.id>54</labs.id>  <labs.project>jrst</labs.project> -  - <maven.test.skip>false</maven.test.skip> </properties> -  + <build> + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.2</version> + <executions> + <execution> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +  +  +  <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> <url>${maven.scm.url}</url> </scm> -  - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>jrst</artifactId> - <version>[0.8,)</version> - <scope>compile</scope> - </dependency> - </dependencies> +  + <profiles> + <profile> + <id>license</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>0.2</version> + <executions> + <execution> + <goals> + <goal>switch</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Added: maven-jrst-plugin/trunk/src/site/fr/rst/Todo.rst =================================================================== --- maven-jrst-plugin/trunk/src/site/fr/rst/Todo.rst (rev 0) +++ maven-jrst-plugin/trunk/src/site/fr/rst/Todo.rst 2008-10-08 15:18:59 UTC (rev 222) @@ -0,0 +1,2 @@ +TODO +==== \ No newline at end of file Added: maven-jrst-plugin/trunk/src/site/fr/rst/index.rst =================================================================== --- maven-jrst-plugin/trunk/src/site/fr/rst/index.rst (rev 0) +++ maven-jrst-plugin/trunk/src/site/fr/rst/index.rst 2008-10-08 15:18:59 UTC (rev 222) @@ -0,0 +1,13 @@ +maven-jrst-plugin +================= + +.. contents:: + + +Présentation +------------ + +Le plugin maven pour utiliser la librairie jrst TODO + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Modified: maven-jrst-plugin/trunk/src/site/site.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site.xml 2008-10-08 15:17:58 UTC (rev 221) +++ maven-jrst-plugin/trunk/src/site/site.xml 2008-10-08 15:18:59 UTC (rev 222) @@ -1,44 +1,61 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="MavenJRstPlugin"> - - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Maven-JRst-Plugin</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> +<project name="${project.name}"> - <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> + <publishDate format="dd/MM/yyyy"/> - <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/"/> - </links> + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> + </skin> - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinplugin/maven-jrst…" name="T�l�chargement"/> - </menu> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> -  + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> - ${reports} - - </body> + <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="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu ref="parent"/> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Détail goals" href="plugin-info.html"> + <item name="jrst" href="jrst-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + <menu name="Detail goals"> + <item name="generate" href="generate-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + </body> </project>

1 0

r221 - maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 15:17:58 +0000 (Wed, 08 Oct 2008) New Revision: 221 Modified: maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java Log: use DirectoryScanner instead of FileWalker since we do not want at all to treate svn files... do not anymore copy the resources other than rst (this is the role of maven-site-plugin) make parameter more effective Modified: maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2008-10-08 15:16:45 UTC (rev 220) +++ maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2008-10-08 15:17:58 UTC (rev 221) @@ -29,15 +29,13 @@ package org.codelutin.jrst.plugin; -import java.io.File; -import java.io.IOException; - import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; +import org.codehaus.plexus.util.DirectoryScanner; import org.codelutin.jrst.JRST; -import org.codelutin.util.FileUtil; -import org.codelutin.util.FileUtil.FileAction; +import java.io.File; + /** * Génére du xdoc à partir de fichiers Rst. * <p/> @@ -48,80 +46,79 @@ * <li> ... * <p/> * et ils iront au final dans: - * <li> target/generated-site/fr/xdoc/ - * <li> target/generated-site/en/xdoc/ - * <li> target/generated-site/es/xdoc/ + * <li> target/generated-rst/fr/xdoc/ + * <li> target/generated-rst/en/xdoc/ + * <li> target/generated-rst/es/xdoc/ * <li> ... * <p/> * tous les autres fichiers iront dans target/generated-site en * respectant la meme hierarchie de repertoire. - * + * * @goal jrst * @phase pre-site */ -public class JRstPlugin extends AbstractMojo implements FileAction { +public class JRstPlugin extends AbstractMojo { + //implements FileAction { /** * Répertoire source des fichiers Rst - * + * * @parameter default-value="src/site" * @required */ - private String directoryIn = "src/site"; + protected File directoryIn; /** * Encoding en entrée - * + * * @parameter default-value="UTF-8" */ - private String inputEncoding = "UTF-8"; + protected String inputEncoding = "UTF-8"; /** * Encoding en sortie - * + * * @parameter default-value="UTF-8" */ - private String outputEncoding = "UTF-8"; + protected String outputEncoding = "UTF-8"; /** * Répertoire cible des fichiers xdoc générée - * + * * @parameter default-value="target/generated-site" * @required */ - private String directoryOut = "target/generated-site"; + protected File directoryOut; /** * Arréte la génération en cas d'erreurs - * + * * @parameter default-value="true" */ - private boolean ignoreErrors = true; + protected boolean ignoreErrors = true; /** * Ecrase les fichiers générés - * + * * @parameter default-value="ifnewer" */ - private String overwrite = "ifnewer"; + protected String overwrite = "ifnewer"; /** @parameter default-value="fr" */ - private String defaultLocale = "fr"; + protected String defaultLocale = "fr"; /** * Permet d'obtenir plus d'information - * - * @parameter default-value="false" + * + * @parameter expression="${jrst.verbose}" default-value="${maven.verbose}" */ - private boolean verbose = false; + protected boolean verbose; - /** - * Number of generated files. - */ + /** Number of generated files. */ private int numberFilesGenerates; /** * Retourne la langue par defaut precisé dans le pom.xml - * + * * @return la langue par defaut precisé dans le pom.xml */ protected String getDefaultLocale() { @@ -146,16 +143,29 @@ } catch (GenerationJRstException e) { System.out.println("Error during generation for :\n" + GenerationJRstException.getFilesErrors()); - if (!ignoreErrors) + if (!ignoreErrors) { throw new MojoExecutionException("Erreur lors de l'execution"); + } } - actionCopy(); + //actionCopy(); } private void actionGenerate() { getLog().info("Génération des fichier xdocs à partir des fichiers rst"); numberFilesGenerates = 0; - FileUtil.walkAfter(new File(directoryIn), this); + DirectoryScanner ds; + ds = new DirectoryScanner(); + ds.setBasedir(directoryIn); + ds.setIncludes(new String[]{"**\\/*.rst"}); + + ds.scan(); + String[] files = ds.getIncludedFiles(); + + for (String file : files) { + doAction(new File(directoryIn, file)); + } + + //FileUtil.walkAfter(new File(directoryIn), this); getLog().info( "Generating " + numberFilesGenerates + " files to " + directoryOut); @@ -166,7 +176,7 @@ String fileOut = null; getLog().info("Using " + fileIn); if (fileIn.matches(".*[/\\\\]rst[/\\\\].*\\.rst")) { - fileOut = fileIn.replace(directoryIn, directoryOut).replace(".rst", + fileOut = fileIn.replace(directoryIn.getAbsolutePath(), directoryOut.getAbsolutePath()).replace(".rst", ".xml").replaceFirst("([/\\\\])rst([/\\\\])", "$1xdoc$2"); if (defaultLocale != null && !"".equals(defaultLocale)) { @@ -193,40 +203,40 @@ return true; } - private void actionCopy() { + /*protected void actionCopy() { getLog().info("Copie des fichiers images"); - /* Execution de la tâche ant copy */ + // Execution de la tâche ant copy try { if (defaultLocale != null && !"".equals(defaultLocale)) { // copie de tous les fichiers non rst - FileUtil.copyAndRenameRecursively(new File(directoryIn), - new File(directoryOut), false, "([/\\\\])" + FileUtil.copyAndRenameRecursively(directoryIn, + directoryOut, false, "([/\\\\])" + defaultLocale + "([/\\\\])", "$1", true, ".*[/\\\\]rst[/\\\\].*"); // copie des images du repertoire rst dans le build-site FileUtil.copyAndRenameRecursively( - new File(directoryIn), - new File(directoryOut), + directoryIn, + directoryOut, false, // on ne copie que le contenu de directoryIn "([/\\\\])" + defaultLocale + "([/\\\\])rst([/\\\\])", "$1resources$2", false, ".*[/\\\\]rst[/\\\\].*(\\.png|\\.jpeg|\\.jpg|\\.gif)$"); } else { // copie de tous les fichiers non rst - FileUtil.copyAndRenameRecursively(new File(directoryIn), - new File(directoryOut), false, "", "", true, + FileUtil.copyAndRenameRecursively(directoryIn, + directoryOut, false, "", "", true, ".*[/\\\\]rst[/\\\\].*"); // copie des images du repertoire rst dans le build-site - FileUtil.copyAndRenameRecursively(new File(directoryIn), - new File(directoryOut), false, "([/\\\\])rst([/\\\\])", + FileUtil.copyAndRenameRecursively(directoryIn, + directoryOut, false, "([/\\\\])rst([/\\\\])", "$1resources$2", false, ".*[/\\\\]rst[/\\\\].*(\\.png|\\.jpeg|\\.jpg|\\.gif)$"); } } catch (IOException eee) { getLog().error(eee); } - } + }*/ }

1 0

r220 - in maven-jrst-plugin/trunk/src/main: . resources
by tchemit＠users.labs.libre-entreprise.org 08 Oct '08

08 Oct '08

Author: tchemit Date: 2008-10-08 15:16:45 +0000 (Wed, 08 Oct 2008) New Revision: 220 Added: maven-jrst-plugin/trunk/src/main/resources/ maven-jrst-plugin/trunk/src/main/resources/log4j.properties Log: add log for plugin Added: maven-jrst-plugin/trunk/src/main/resources/log4j.properties =================================================================== --- maven-jrst-plugin/trunk/src/main/resources/log4j.properties (rev 0) +++ maven-jrst-plugin/trunk/src/main/resources/log4j.properties 2008-10-08 15:16:45 UTC (rev 220) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +log4j.logger.org.codelutin.jrst.plugin=INFO

1 0

r219 - maven-jrst-plugin/trunk
by chatellier＠users.labs.libre-entreprise.org 03 Oct '08

03 Oct '08

Author: chatellier Date: 2008-10-03 13:18:32 +0000 (Fri, 03 Oct 2008) New Revision: 219 Modified: maven-jrst-plugin/trunk/pom.xml Log: Take default value from super pom Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2008-10-02 17:47:24 UTC (rev 218) +++ maven-jrst-plugin/trunk/pom.xml 2008-10-03 13:18:32 UTC (rev 219) @@ -26,8 +26,6 @@ <inceptionYear>2006</inceptionYear> - <url>${labs.project.url}</url> - <properties>  <labs.id>54</labs.id> @@ -43,8 +41,7 @@ <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> -  + <url>${maven.scm.url}</url> </scm>

1 0

r218 - jrst/trunk
by chatellier＠users.labs.libre-entreprise.org 02 Oct '08

02 Oct '08

Author: chatellier Date: 2008-10-02 17:47:24 +0000 (Thu, 02 Oct 2008) New Revision: 218 Modified: jrst/trunk/changelog Log: Forgot changelog :( Modified: jrst/trunk/changelog =================================================================== --- jrst/trunk/changelog 2008-10-02 17:44:00 UTC (rev 217) +++ jrst/trunk/changelog 2008-10-02 17:47:24 UTC (rev 218) @@ -1,5 +1,6 @@ ver-0.8 xxx xxx - + + * Add title property in xdoc xslt * Switch license to lgpl * maven 2 layout

1 0