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

r429 - trunk
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 04:29:28 +0100 (Thu, 07 Jan 2010) New Revision: 429 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 10:20:40 UTC (rev 428) +++ trunk/pom.xml 2010-01-07 03:29:28 UTC (rev 429) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> </parent> <artifactId>jrst</artifactId>

1 0

r428 - trunk
by echatellier＠users.nuiton.org Jan. 6, 2010

Jan. 6, 2010

Author: echatellier Date: 2010-01-06 11:20:40 +0100 (Wed, 06 Jan 2010) New Revision: 428 Removed: trunk/testphp/ Log: Remove testphp

1 0

r427 - in trunk: . testphp testphp/nbproject
by glorieux＠users.nuiton.org Dec. 24, 2009

Dec. 24, 2009

Author: glorieux Date: 2009-12-24 10:25:54 +0100 (Thu, 24 Dec 2009) New Revision: 427 Added: trunk/testphp/ trunk/testphp/index.php trunk/testphp/nbproject/ trunk/testphp/nbproject/project.properties trunk/testphp/nbproject/project.xml Log: Test Added: trunk/testphp/index.php =================================================================== --- trunk/testphp/index.php (rev 0) +++ trunk/testphp/index.php 2009-12-24 09:25:54 UTC (rev 427) @@ -0,0 +1,21 @@ +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <title>Ceci est une page de test avec des balises PHP</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + </head> + <body> + <h2>Page de test</h2> + <?php + $userInfo = array ( + + ); + displayInfo($userInfo); + function displayInfo ($userInfo) { + echo "Les infos sont : <br/>"; + echo $userInfo['name']."<br/>"; + echo $userInfo['surname']."<br/>"; + echo $userInfo['phoneNumber']."<br/>"; + } + ?> + </body> +</html> \ No newline at end of file Property changes on: trunk/testphp/nbproject ___________________________________________________________________ Added: svn:ignore + private Added: trunk/testphp/nbproject/project.properties =================================================================== --- trunk/testphp/nbproject/project.properties (rev 0) +++ trunk/testphp/nbproject/project.properties 2009-12-24 09:25:54 UTC (rev 427) @@ -0,0 +1,6 @@ +include.path=${php.global.include.path} +source.encoding=UTF-8 +src.dir=. +tags.asp=false +tags.short=true +web.root=. Added: trunk/testphp/nbproject/project.xml =================================================================== --- trunk/testphp/nbproject/project.xml (rev 0) +++ trunk/testphp/nbproject/project.xml 2009-12-24 09:25:54 UTC (rev 427) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.php.project</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/php-project/1"> + <name>testphp</name> + </data> + </configuration> +</project>

1 0

r426 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org Dec. 22, 2009

Dec. 22, 2009

Author: tchemit Date: 2009-12-22 10:18:23 +0100 (Tue, 22 Dec 2009) New Revision: 426 Modified: trunk/doxia-module-jrst/pom.xml trunk/jrst-doc/pom.xml trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Log: use :: module name convention Modified: trunk/doxia-module-jrst/pom.xml =================================================================== --- trunk/doxia-module-jrst/pom.xml 2009-12-22 09:16:42 UTC (rev 425) +++ trunk/doxia-module-jrst/pom.xml 2009-12-22 09:18:23 UTC (rev 426) @@ -59,7 +59,7 @@   - <name>JRst - Doxia module</name> + <name>JRst :: Doxia module</name> <description>JRst module for doxia</description> <inceptionYear>2009</inceptionYear> Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2009-12-22 09:16:42 UTC (rev 425) +++ trunk/jrst/pom.xml 2009-12-22 09:18:23 UTC (rev 426) @@ -84,7 +84,7 @@   - <name>JRst - lib</name> + <name>JRst :: Api</name> <description>Parser RST en Java.</description> <inceptionYear>2004</inceptionYear> Modified: trunk/jrst-doc/pom.xml =================================================================== --- trunk/jrst-doc/pom.xml 2009-12-22 09:16:42 UTC (rev 425) +++ trunk/jrst-doc/pom.xml 2009-12-22 09:18:23 UTC (rev 426) @@ -20,7 +20,7 @@   - <name>JRst - doc</name> + <name>JRst :: Documentation</name> <description>JRST documentations</description> <inceptionYear>2009</inceptionYear> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2009-12-22 09:16:42 UTC (rev 425) +++ trunk/maven-jrst-plugin/pom.xml 2009-12-22 09:18:23 UTC (rev 426) @@ -45,7 +45,7 @@    - <name>JRst - maven plugin</name> + <name>JRst :: Maven plugin</name> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-22 09:16:42 UTC (rev 425) +++ trunk/pom.xml 2009-12-22 09:18:23 UTC (rev 426) @@ -220,7 +220,7 @@    - <name>JRst - project</name> + <name>JRst</name> <description>JRst</description> <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/jrst</url> @@ -284,9 +284,9 @@ <maven.site.locales>fr</maven.site.locales>  - <doxia.version>1.0</doxia.version> - <nuiton-utils.version>1.1.0</nuiton-utils.version> - <i18n.version>1.0.2-SNAPSHOT</i18n.version> + <doxia.version>1.1.2</doxia.version> + <nuiton-utils.version>1.1.1</nuiton-utils.version> + <i18n.version>1.0.1</i18n.version> </properties> <build>

1 0

r425 - in trunk: doxia-module-jrst/src/site jrst/src/site jrst-doc/src/site maven-jrst-plugin/src/site
by tchemit＠users.nuiton.org Dec. 22, 2009

Dec. 22, 2009

Author: tchemit Date: 2009-12-22 10:16:42 +0100 (Tue, 22 Dec 2009) New Revision: 425 Added: trunk/doxia-module-jrst/src/site/site_fr.xml trunk/jrst-doc/src/site/site_fr.xml trunk/jrst/src/site/site_fr.xml trunk/maven-jrst-plugin/src/site/site_fr.xml Removed: trunk/doxia-module-jrst/src/site/site.xml trunk/jrst-doc/src/site/site.xml trunk/jrst/src/site/site.xml trunk/maven-jrst-plugin/src/site/site.xml Log: to use mavenpom site descriptor heritance Deleted: trunk/doxia-module-jrst/src/site/site.xml =================================================================== --- trunk/doxia-module-jrst/src/site/site.xml 2009-12-22 09:15:56 UTC (rev 424) +++ trunk/doxia-module-jrst/src/site/site.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="User"> - <item href="/index.html" name="About"/> - </menu> - - <menu name="Developer"> - <item href="/devel.html" name="Documentation"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/doxia-module-jrst/src/site/site_fr.xml (from rev 423, trunk/doxia-module-jrst/src/site/site.xml) =================================================================== --- trunk/doxia-module-jrst/src/site/site_fr.xml (rev 0) +++ trunk/doxia-module-jrst/src/site/site_fr.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item href="/index.html" name="About"/> + </menu> + + <menu name="Developer"> + <item href="/devel.html" name="Documentation"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/jrst/src/site/site.xml =================================================================== --- trunk/jrst/src/site/site.xml 2009-12-22 09:15:56 UTC (rev 424) +++ trunk/jrst/src/site/site.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>Java ReStructuredText parser</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> \ No newline at end of file Copied: trunk/jrst/src/site/site_fr.xml (from rev 423, trunk/jrst/src/site/site.xml) =================================================================== --- trunk/jrst/src/site/site_fr.xml (rev 0) +++ trunk/jrst/src/site/site_fr.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>Java ReStructuredText parser</name> + <href>/</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> \ No newline at end of file Property changes on: trunk/jrst/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + Added: svn:eol-style + native Deleted: trunk/jrst-doc/src/site/site.xml =================================================================== --- trunk/jrst-doc/src/site/site.xml 2009-12-22 09:15:56 UTC (rev 424) +++ trunk/jrst-doc/src/site/site.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <poweredBy> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> - </poweredBy> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <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"/> - </menu> - - <menu name="Developpeur"> - <item name="Fonctionnement" href="/devel/docDeveloppeur.html"/> - <item name="Presentation au XSL" href="/devel/presentationXSL.html"/> - <item name="Librairies utilisées" href="/devel/librairies.html"/> - <item name="Todo" href="/devel/Todo.html"/> - <item name="Documentation externe" href="/devel/docExterne.html"/> - </menu> - - </body> -</project> \ No newline at end of file Copied: trunk/jrst-doc/src/site/site_fr.xml (from rev 423, trunk/jrst-doc/src/site/site.xml) =================================================================== --- trunk/jrst-doc/src/site/site_fr.xml (rev 0) +++ trunk/jrst-doc/src/site/site_fr.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <poweredBy> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> + + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <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"/> + </menu> + + <menu name="Developpeur"> + <item name="Fonctionnement" href="/devel/docDeveloppeur.html"/> + <item name="Presentation au XSL" href="/devel/presentationXSL.html"/> + <item name="Librairies utilisées" href="/devel/librairies.html"/> + <item name="Todo" href="/devel/Todo.html"/> + <item name="Documentation externe" href="/devel/docExterne.html"/> + </menu> + + </body> +</project> \ No newline at end of file Property changes on: trunk/jrst-doc/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + Added: svn:eol-style + native Deleted: trunk/maven-jrst-plugin/src/site/site.xml =================================================================== --- trunk/maven-jrst-plugin/src/site/site.xml 2009-12-22 09:15:56 UTC (rev 424) +++ trunk/maven-jrst-plugin/src/site/site.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>/</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.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="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - </body> -</project> Copied: trunk/maven-jrst-plugin/src/site/site_fr.xml (from rev 423, trunk/maven-jrst-plugin/src/site/site.xml) =================================================================== --- trunk/maven-jrst-plugin/src/site/site_fr.xml (rev 0) +++ trunk/maven-jrst-plugin/src/site/site_fr.xml 2009-12-22 09:16:42 UTC (rev 425) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>/</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.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="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/jrst/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + </body> +</project> Property changes on: trunk/maven-jrst-plugin/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + Added: svn:eol-style + native

1 0

r424 - trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst
by tchemit＠users.nuiton.org Dec. 22, 2009

Dec. 22, 2009

Author: tchemit Date: 2009-12-22 10:15:56 +0100 (Tue, 22 Dec 2009) New Revision: 424 Modified: trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java Log: fix possible NPE Modified: trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java =================================================================== --- trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java 2009-12-18 13:34:56 UTC (rev 423) +++ trunk/doxia-module-jrst/src/test/java/org/nuiton/jrst/JrstParserTest.java 2009-12-22 09:15:56 UTC (rev 424) @@ -45,7 +45,6 @@ return parser; } - /** @throws Exception */ public void testParseRst() throws Exception { StringWriter output = null; Reader reader = null; @@ -63,8 +62,12 @@ assertTrue(output.toString().indexOf("Title") != -1); assertTrue(output.toString().indexOf("blocks.") != -1);*/ } finally { - output.close(); - reader.close(); + if (output != null) { + output.close(); + } + if (reader != null) { + reader.close(); + } } }

1 0

r423 - trunk
by tchemit＠users.nuiton.org Dec. 18, 2009

Dec. 18, 2009

Author: tchemit Date: 2009-12-18 14:34:56 +0100 (Fri, 18 Dec 2009) New Revision: 423 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 07:12:40 UTC (rev 422) +++ trunk/pom.xml 2009-12-18 13:34:56 UTC (rev 423) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.3</version> </parent> <artifactId>jrst</artifactId>

1 0

r422 - in trunk: . jrst maven-jrst-plugin
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 08:12:40 +0100 (Mon, 02 Nov 2009) New Revision: 422 Modified: trunk/jrst/pom.xml trunk/maven-jrst-plugin/pom.xml trunk/pom.xml Log: use mavenpom 1.1.0, normalize nuiton libs Modified: trunk/jrst/pom.xml =================================================================== --- trunk/jrst/pom.xml 2009-11-02 03:46:24 UTC (rev 421) +++ trunk/jrst/pom.xml 2009-11-02 07:12:40 UTC (rev 422) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/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> @@ -39,7 +40,7 @@ <groupId>org.apache.xmlgraphics</groupId> <artifactId>fop</artifactId> </dependency> - +  <dependency> <groupId>uk.co.flamingpenguin.jewelcli</groupId> @@ -71,7 +72,7 @@ <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -135,12 +136,20 @@ <plugin> <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> <executions> <execution> <id>copy-dependencies</id> +  + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + </configuration> </execution> </executions> </plugin> @@ -184,7 +193,7 @@ <plugins>  - <plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> Modified: trunk/maven-jrst-plugin/pom.xml =================================================================== --- trunk/maven-jrst-plugin/pom.xml 2009-11-02 03:46:24 UTC (rev 421) +++ trunk/maven-jrst-plugin/pom.xml 2009-11-02 07:12:40 UTC (rev 422) @@ -74,6 +74,195 @@ </executions> </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <docencoding>${project.reporting.outputEncoding}</docencoding> + <encoding>${project.reporting.outputEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <quiet>true</quiet> + <skip>${maven.javadoc.skip}</skip> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + </plugin> + </plugins> </build> @@ -85,6 +274,199 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <quiet>true</quiet> + <skip>${maven.javadoc.skip}</skip> + <docencoding>${project.build.sourceEncoding}</docencoding> + <encoding>${project.build.sourceEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.4.2</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-javadoc</artifactId> + <version>1.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> </plugins> </reporting> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:46:24 UTC (rev 421) +++ trunk/pom.xml 2009-11-02 07:12:40 UTC (rev 422) @@ -36,7 +36,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.0</version> + <version>${nuiton-utils.version}</version> <scope>compile</scope> </dependency> @@ -285,7 +285,8 @@  <doxia.version>1.0</doxia.version> - + <nuiton-utils.version>1.1.0</nuiton-utils.version> + <i18n.version>1.0.2-SNAPSHOT</i18n.version> </properties> <build> @@ -304,7 +305,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>${i18n.version}</version> </plugin> </plugins>

1 0

r421 - trunk
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 04:46:24 +0100 (Mon, 02 Nov 2009) New Revision: 421 Modified: trunk/pom.xml Log: use mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:36:42 UTC (rev 420) +++ trunk/pom.xml 2009-11-02 03:46:24 UTC (rev 421) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/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> @@ -9,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>jrst</artifactId> @@ -197,7 +198,7 @@ <artifactId>doxia-module-xdoc</artifactId> <version>${doxia.version}</version> </dependency> - + <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> @@ -274,7 +275,7 @@ <packaging>pom</packaging> <properties> - +  <projectId>jrst</projectId> @@ -284,7 +285,7 @@  <doxia.version>1.0</doxia.version> - + </properties> <build> @@ -305,7 +306,7 @@ <artifactId>maven-i18n-plugin</artifactId> <version>1.0.1-SNAPSHOT</version> </plugin> - + </plugins> </pluginManagement> @@ -330,5 +331,5 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> </scm> - + </project>

1 0

r420 - in trunk: . doxia-module-jrst jrst jrst-doc maven-jrst-plugin
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 04:36:42 +0100 (Mon, 02 Nov 2009) New Revision: 420 Modified: trunk/ trunk/doxia-module-jrst/ trunk/jrst-doc/ trunk/jrst/ trunk/maven-jrst-plugin/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project + target .settings .classpath .project *.iml Property changes on: trunk/doxia-module-jrst ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.iml Property changes on: trunk/jrst ___________________________________________________________________ Modified: svn:ignore - maven.log target velocity.log .settings .classpath .project nbproject + maven.log target velocity.log .settings .classpath .project nbproject *.iml Property changes on: trunk/jrst-doc ___________________________________________________________________ Modified: svn:ignore - target nbactions.xml + target nbactions.xml *.iml Property changes on: trunk/maven-jrst-plugin ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws .classpath .project target nbactions.xml .settings + *.ipr *.iws *.iml .classpath .project target nbactions.xml .settings

1 0