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> <!-- where to generate source --> - <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> - <!-- where to generated rst --> - <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> + <!-- where to generated site --> + <maven.site.gen.dir>${project.build.directory}/generated-site</maven.site.gen.dir> - <!-- locales for the site generation, by default only french --> <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> <!-- for generated rst files --> - <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> <!-- where to generate source --> - <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> - <!-- where to generated rst --> - <maven.rst.gen.dir>${project.build.directory}/generated-rst</maven.rst.gen.dir> + <!-- where to generate site --> + <maven.site.gen.dir>${project.build.directory}/generated-site</maven.site.gen.dir> <!-- locales for the site generation, by default only french --> <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> - <!-- for generated rst files --> - <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> + <!--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>