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 host --> <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url> - <!-- by default, maven is quiet --> - <maven.verbose>false</maven.verbose> - <!-- by default, java sources are in java 1.6 --> <maven.compile.source>1.6</maven.compile.source> @@ -234,9 +231,13 @@ <!-- where to generate source --> <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> - <!-- where to generate site --> - <maven.site.gen.dir>${basedir}/target/generated-site</maven.site.gen.dir> + <!-- where to generated rst --> + <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> + + <!-- locales for the site generation, by default only french --> + <maven.site.locales>fr</maven.site.locales> + <!-- to allow bad tests --> <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.site.gen.dir}/xdoc/fr/rst</xdocDirectory> --> + <!-- for generated rst files --> + <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> - <!--Tasks Ant--> + <!-- Always process jrst files, but only called on pre-site phase --> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!--Copy files for site--> - <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 host --> <labs.builder.url>http://lutinbuilder.labs.libre-entreprise.org/maven2</labs.builder.url> - <!-- by default, maven is quiet --> - <maven.verbose>false</maven.verbose> - <!-- by default, java sources are in java 1.6 --> <maven.compile.source>1.6</maven.compile.source> @@ -212,9 +209,12 @@ <!-- where to generate source --> <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> - <!-- where to generate site --> - <maven.site.gen.dir>${basedir}/target/generated-site</maven.site.gen.dir> + <!-- where to generated rst --> + <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> + <!-- locales for the site generation, by default only french --> + <maven.site.locales>fr</maven.site.locales> + <!-- to allow bad tests --> <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> </properties> @@ -252,7 +252,6 @@ </resource> </resources> - <!-- <testSourceDirectory>${maven.src.dir}/test/java</testSourceDirectory> --> <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.site.gen.dir}/xdoc/fr/rst</xdocDirectory> --> + <!-- for generated rst files --> + <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 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> - <!-- not always compute javadoc jar, --> - <!--plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin--> - + <!-- always compute source jar --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -537,34 +514,12 @@ <artifactId>maven-license-switcher-plugin</artifactId> </plugin> - <!--Tasks Ant--> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!--Copy files for site--> - <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> - <!-- Always process jrst files, but only called on pre-site phase --> <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> </plugin> + </plugins> </build>