October 2008 - Mavenpom-commits - mailman.cloud.codelutin.com

[Lutinbuilder-commits] r204 - lutinpluginproject/trunk lutinproject/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 8, 2008

Oct. 8, 2008

Author: tchemit Date: 2008-10-08 21:33:08 +0000 (Wed, 08 Oct 2008) New Revision: 204 Modified: lutinpluginproject/trunk/pom.xml lutinproject/trunk/pom.xml Log: at least makes site works for multilanguage with no treak... the rst plugin will deal with his own resource, so do not copy any rst stuff from the ant task Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-10-08 15:43:08 UTC (rev 203) +++ lutinpluginproject/trunk/pom.xml 2008-10-08 21:33:08 UTC (rev 204) @@ -247,7 +247,7 @@  <resources> - + <resource> <directory>${maven.src.dir}/main/resources</directory> <includes> @@ -406,7 +406,7 @@ </execution> </executions> </plugin> - +    @@ -455,19 +455,44 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> - +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> </plugin> - -  + +  <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>CopySiteFiles</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${maven.src.dir}/site"/> + <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> + <fileset dir="${maven.src.dir}/site"> + <exclude name="**/rst/**"/> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> </plugin> - + </plugins> </build> @@ -551,9 +576,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> </plugin> - +  -  +  <!--plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId> Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-10-08 15:43:08 UTC (rev 203) +++ lutinproject/trunk/pom.xml 2008-10-08 21:33:08 UTC (rev 204) @@ -525,7 +525,9 @@ <tasks> <mkdir dir="${maven.src.dir}/site"/> <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${maven.src.dir}/site"/> + <fileset dir="${maven.src.dir}/site"> + <exclude name="**/rst/**"/> + </fileset> </copy> </tasks> </configuration>

1 0

[Lutinbuilder-commits] r203 - lutinpluginproject/trunk lutinproject/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 8, 2008

Oct. 8, 2008

Author: tchemit Date: 2008-10-08 15:43:08 +0000 (Wed, 08 Oct 2008) New Revision: 203 Modified: lutinpluginproject/trunk/pom.xml lutinproject/trunk/pom.xml Log: rollback pour les sites multilangues qui ne fonctionnent plus... Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-10-08 14:26:53 UTC (rev 202) +++ lutinpluginproject/trunk/pom.xml 2008-10-08 15:43:08 UTC (rev 203) @@ -229,12 +229,11 @@ <maven.src.dir>${basedir}/src</maven.src.dir>  - <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> -  - <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> +  + <maven.site.gen.dir>${project.build.directory}/generated-site</maven.site.gen.dir> -  <maven.site.locales>fr</maven.site.locales> @@ -393,7 +392,7 @@ <version>0.8.2</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.rst.gen.dir}</directoryOut> + <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> @@ -419,7 +418,7 @@ <version>2.0-beta-7</version> <configuration>  - <xdocDirectory>${maven.rst.gen.dir}/xdoc</xdocDirectory> + <siteDirectory>${maven.site.gen.dir}</siteDirectory> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-10-08 14:26:53 UTC (rev 202) +++ lutinproject/trunk/pom.xml 2008-10-08 15:43:08 UTC (rev 203) @@ -207,10 +207,10 @@ <maven.src.dir>${basedir}/src</maven.src.dir>  - <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> -  - <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> +  + <maven.site.gen.dir>${project.build.directory}/generated-site</maven.site.gen.dir>  <maven.site.locales>fr</maven.site.locales> @@ -463,7 +463,7 @@ <version>0.8.2</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.rst.gen.dir}</directoryOut> + <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> @@ -488,8 +488,7 @@ <artifactId>maven-site-plugin</artifactId> <version>2.0-beta-7</version> <configuration> -  - <xdocDirectory>${maven.rst.gen.dir}/xdoc</xdocDirectory> + <siteDirectory>${maven.site.gen.dir}</siteDirectory> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> @@ -514,12 +513,34 @@ <artifactId>maven-license-switcher-plugin</artifactId> </plugin> +  + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>CopySiteFiles</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${maven.src.dir}/site"/> + <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> + <fileset dir="${maven.src.dir}/site"/> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> +  <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> </plugin> - </plugins> </build>

1 0

[Lutinbuilder-commits] r202 - lutinpluginproject/trunk lutinproject/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 8, 2008

Oct. 8, 2008

Author: tchemit Date: 2008-10-08 14:26:53 +0000 (Wed, 08 Oct 2008) New Revision: 202 Modified: lutinpluginproject/trunk/changelog lutinpluginproject/trunk/pom.xml lutinproject/trunk/changelog lutinproject/trunk/pom.xml Log: make site generation with no copy at all + little improvments Modified: lutinpluginproject/trunk/changelog =================================================================== --- lutinpluginproject/trunk/changelog 2008-10-07 20:17:22 UTC (rev 201) +++ lutinpluginproject/trunk/changelog 2008-10-08 14:26:53 UTC (rev 202) @@ -1,4 +1,8 @@ ver-3-0 chemit (20080924) + * make site with no copy of any file at all (not in rst, not in ant!) + * remove maven.verbose property, cause some bad side effects. + * add property maven.site.locales to define locales to be used by site + * use jrst.verbose in jrst plugin instead of maven.verbose * For child pom scm inheritance * Modify SCM url for new SVN structure * Use new SVN structure Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-10-07 20:17:22 UTC (rev 201) +++ lutinpluginproject/trunk/pom.xml 2008-10-08 14:26:53 UTC (rev 202) @@ -216,9 +216,6 @@  <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url> -  - <maven.verbose>false</maven.verbose> -  <maven.compile.source>1.6</maven.compile.source> @@ -234,9 +231,13 @@  <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> -  - <maven.site.gen.dir>${basedir}/target/generated-site</maven.site.gen.dir> +  + <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> + +  + <maven.site.locales>fr</maven.site.locales> +  <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> </properties> @@ -392,15 +393,13 @@ <version>0.8.2</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <verbose>${maven.verbose}</verbose> + <directoryOut>${maven.rst.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> </configuration> <executions> <execution> - <id>jrst-pre-site</id> <phase>pre-site</phase> <goals> <goal>jrst</goal> @@ -419,12 +418,12 @@ <artifactId>maven-site-plugin</artifactId> <version>2.0-beta-7</version> <configuration> - <siteDirectory>${maven.site.gen.dir}</siteDirectory> -  +  + <xdocDirectory>${maven.rst.gen.dir}/xdoc</xdocDirectory> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> - <locales>fr</locales> + <locales>${maven.site.locales}</locales> </configuration> </plugin> @@ -435,7 +434,6 @@ <version>2.4.2</version> <executions> <execution> - <id>helpmojo</id> <goals> <goal>helpmojo</goal> </goals> @@ -465,29 +463,12 @@ <artifactId>maven-plugin-plugin</artifactId> </plugin> -  +  <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>CopySiteFiles</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.src.dir}/site"/> - <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${maven.src.dir}/site"/> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> </plugin> - + </plugins> </build> Modified: lutinproject/trunk/changelog =================================================================== --- lutinproject/trunk/changelog 2008-10-07 20:17:22 UTC (rev 201) +++ lutinproject/trunk/changelog 2008-10-08 14:26:53 UTC (rev 202) @@ -1,4 +1,9 @@ ver-3-0 chatellier (20080924) + * make site with no copy of any file at all (not in rst, not in ant!) + * remove maven.verbose property, cause some bad side effects. + * remove plugin maven-plugin-plugin (nothing to be done here...) + * add property maven.site.locales to define locales to be used by site + * use jrst.verbose in jrst plugin instead of maven.verbose * For child pom scm inheritance * Modify SCM url for new SVN structure * Use new SVN structure Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-10-07 20:17:22 UTC (rev 201) +++ lutinproject/trunk/pom.xml 2008-10-08 14:26:53 UTC (rev 202) @@ -194,9 +194,6 @@  <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url> -  - <maven.verbose>false</maven.verbose> -  <maven.compile.source>1.6</maven.compile.source> @@ -212,9 +209,12 @@  <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> -  - <maven.site.gen.dir>${basedir}/target/generated-site</maven.site.gen.dir> +  + <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> +  + <maven.site.locales>fr</maven.site.locales> +  <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> </properties> @@ -252,7 +252,6 @@ </resource> </resources> -  <pluginManagement> <plugins> @@ -464,15 +463,13 @@ <version>0.8.2</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <verbose>${maven.verbose}</verbose> + <directoryOut>${maven.rst.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> </configuration> <executions> <execution> - <id>jrst-pre-site</id> <phase>pre-site</phase> <goals> <goal>jrst</goal> @@ -491,40 +488,20 @@ <artifactId>maven-site-plugin</artifactId> <version>2.0-beta-7</version> <configuration> - <siteDirectory>${maven.site.gen.dir}</siteDirectory> -  +  + <xdocDirectory>${maven.rst.gen.dir}/xdoc</xdocDirectory> <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports> - <locales>fr</locales> + <locales>${maven.site.locales}</locales> </configuration> </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.2</version> - <executions> - <execution> - <id>helpmojo</id> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </pluginManagement> <plugins> -  -  - +  <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -537,34 +514,12 @@ <artifactId>maven-license-switcher-plugin</artifactId> </plugin> -  - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>CopySiteFiles</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.src.dir}/site"/> - <copy todir="${maven.site.gen.dir}" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${maven.src.dir}/site"/> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> -  <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> </plugin> + </plugins> </build>

1 0

[Lutinbuilder-commits] r201 - lutinproject/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 20:17:22 +0000 (Tue, 07 Oct 2008) New Revision: 201 Modified: lutinproject/trunk/ Log: svn ignore Property changes on: lutinproject/trunk ___________________________________________________________________ Name: svn:ignore - .classpath .project THIRD-PARTY.txt + .classpath .project THIRD-PARTY.txt target

1 0

[Lutinbuilder-commits] r200 - lutinpluginproject/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 7, 2008

Oct. 7, 2008

Author: tchemit Date: 2008-10-07 14:02:35 +0000 (Tue, 07 Oct 2008) New Revision: 200 Modified: lutinpluginproject/trunk/pom.xml Log: make javadoc on pre-site Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-10-03 08:57:45 UTC (rev 199) +++ lutinpluginproject/trunk/pom.xml 2008-10-07 14:02:35 UTC (rev 200) @@ -373,7 +373,7 @@ </configuration> <executions> <execution> - <phase>verify</phase> + <phase>pre-site</phase> <goals> <goal>jar</goal> </goals>

1 0

[Lutinbuilder-commits] r199 - lutinproject/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 3, 2008

Oct. 3, 2008

Author: chatellier Date: 2008-10-03 08:57:45 +0000 (Fri, 03 Oct 2008) New Revision: 199 Modified: lutinproject/trunk/pom.xml Log: Comment unneeded xdoc conf Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-10-03 08:57:37 UTC (rev 198) +++ lutinproject/trunk/pom.xml 2008-10-03 08:57:45 UTC (rev 199) @@ -492,7 +492,7 @@ <version>2.0-beta-7</version> <configuration> <siteDirectory>${maven.site.gen.dir}</siteDirectory> - <xdocDirectory>${maven.site.gen.dir}/xdoc/fr/rst</xdocDirectory> +  <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports>

1 0

[Lutinbuilder-commits] r198 - lutinpluginproject/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 3, 2008

Oct. 3, 2008

Author: chatellier Date: 2008-10-03 08:57:37 +0000 (Fri, 03 Oct 2008) New Revision: 198 Modified: lutinpluginproject/trunk/pom.xml Log: Comment unneeded xdoc conf Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-10-01 16:08:30 UTC (rev 197) +++ lutinpluginproject/trunk/pom.xml 2008-10-03 08:57:37 UTC (rev 198) @@ -420,7 +420,7 @@ <version>2.0-beta-7</version> <configuration> <siteDirectory>${maven.site.gen.dir}</siteDirectory> - <xdocDirectory>${maven.site.gen.dir}/xdoc/fr/rst</xdocDirectory> +  <inputEncoding>${maven.compile.encoding}</inputEncoding> <outputEncoding>${maven.compile.encoding}</outputEncoding> <generateReports>${maven.reports.generate}</generateReports>

1 0

[Lutinbuilder-commits] r197 - lutinpluginproject/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 1, 2008

Oct. 1, 2008

Author: chatellier Date: 2008-10-01 16:08:30 +0000 (Wed, 01 Oct 2008) New Revision: 197 Modified: lutinpluginproject/trunk/pom.xml Log: On ne doit pas avoir le droit d'utiliser des properties en project.xxx Renommage de "project.home.url" en "site.home.url" Modified: lutinpluginproject/trunk/pom.xml =================================================================== --- lutinpluginproject/trunk/pom.xml 2008-10-01 16:07:03 UTC (rev 196) +++ lutinpluginproject/trunk/pom.xml 2008-10-01 16:08:30 UTC (rev 197) @@ -84,7 +84,7 @@ <description>Projet Maven de reference pour les plugins des autres projets Maven.</description>  - <url>${project.home.url}</url> + <url>${site.home.url}</url> <inceptionYear>2008</inceptionYear> @@ -194,7 +194,7 @@ <labs.project>${pom.artifactId}</labs.project>  - <project.home.url>http://${labs.project}.${labs.host}</project.home.url> + <site.home.url>http://${labs.project}.${labs.host}</site.home.url>  <maven.scm.url>http://${labs.host}/plugins/scmsvn/viewcvs.php/${pom.artifactId}/trunk/?root=${labs.project}

1 0

[Lutinbuilder-commits] r196 - lutinproject/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 1, 2008

Oct. 1, 2008

Author: chatellier Date: 2008-10-01 16:07:03 +0000 (Wed, 01 Oct 2008) New Revision: 196 Modified: lutinproject/trunk/pom.xml Log: On ne doit pas avoir le droit d'utiliser des properties en project.xxx Renommage de "project.home.url" en "site.home.url" Modified: lutinproject/trunk/pom.xml =================================================================== --- lutinproject/trunk/pom.xml 2008-09-25 09:08:06 UTC (rev 195) +++ lutinproject/trunk/pom.xml 2008-10-01 16:07:03 UTC (rev 196) @@ -62,7 +62,7 @@ <description>Projet Maven de référence pour l'ensemble des autres projets Maven.</description>  - <url>${project.home.url}</url> + <url>${site.home.url}</url> <inceptionYear>1999</inceptionYear> @@ -172,7 +172,7 @@ <labs.project>${pom.artifactId}</labs.project>  - <project.home.url>http://${labs.project}.${labs.host}</project.home.url> + <site.home.url>http://${labs.project}.${labs.host}</site.home.url>  <maven.scm.url>http://${labs.host}/plugins/scmsvn/viewcvs.php/${pom.artifactId}/trunk/?root=${labs.project}

1 0