Author: tchemit Date: 2014-01-16 16:08:54 +0100 (Thu, 16 Jan 2014) New Revision: 1492 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1492 Log: fixes #4136: [TECH] Int?\195?\169gration de l'aide en ligne dans le site g?\195?\169n?\195?\169r?\195?\169 Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-16 14:36:24 UTC (rev 1491) +++ trunk/pom.xml 2014-01-16 15:08:54 UTC (rev 1492) @@ -159,12 +159,6 @@ <!-- Last JRE version to use --> <jreVersion>1.7.45</jreVersion> - <!-- Last tutti db version --> - <dbVersion>2013.12.19</dbVersion> - - <!-- Last tutti report version --> - <reportVersion>2013.12.05</reportVersion> - </properties> <repositories> @@ -499,6 +493,11 @@ <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> </dependency> + <dependency> + <groupId>fr.ifremer.shared</groupId> + <artifactId>application</artifactId> + <version>${ifremerApplicationVersion}</version> + </dependency> </dependencies> </plugin> @@ -602,14 +601,6 @@ <property>jreVersion</property> <message>You must set a jreVersion property!</message> </requireProperty> - <requireProperty> - <property>dbVersion</property> - <message>You must set a dbVersion property!</message> - </requireProperty> - <requireProperty> - <property>reportVersion</property> - <message>You must set a reportVersion property!</message> - </requireProperty> </rules> <ignoreCache>true</ignoreCache> <failFast>true</failFast> @@ -733,7 +724,7 @@ </profile> <profile> - <id>deploy-tutti-data-update</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> @@ -742,25 +733,23 @@ </activation> <build> - <defaultGoal>deploy</defaultGoal> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>copy tutti-data.properties to site</id> - <phase>package</phase> + <id>Copy help site</id> + <phase>pre-site</phase> <inherited>false</inherited> <configuration> <tasks> - <echo message="copy tutti-db.properties to site" /> - <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> - <filterset> - <filter value="${dbVersion}" token="dbVersion" /> - <filter value="${reportVersion}" token="reportVersion" /> - </filterset> - <fileset dir="${basedir}/src/update/"> - <include name="tutti-data.properties" /> + <echo message="Copy help to site" /> + <copy verbose="${maven.verbose}" + failonerror="false" + overwrite="true" + todir="${project.reporting.outputDirectory}/help"> + <fileset dir="${project.basedir}/tutti-ui-swing/src/main/help"> + <include name="**/*" /> </fileset> </copy> </tasks> @@ -771,46 +760,8 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> - <executions> - <execution> - <id>deploy tutti-db.properties</id> - <phase>deploy</phase> - <inherited>false</inherited> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>forge.codelutin.com</serverId> - <fromFile> - ${project.build.directory}/update/tutti-data.properties - </fromFile> - <url> - scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti - </url> - </configuration> - </execution> - </executions> - - </plugin> </plugins> </build> - - </profile> - - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <reporting> <plugins> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-01-16 14:36:24 UTC (rev 1491) +++ trunk/src/site/site_fr.xml 2014-01-16 15:08:54 UTC (rev 1492) @@ -23,7 +23,10 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> @@ -97,13 +100,20 @@ <menu name="Tutti"> <item name="Accueil" href="index.html"/> <item name="Fonctionnalités" href="./features.html"/> - <item name="Téléchargement" + <item name="Téléchargement" target="forge" href="http://forge.codelutin.com/projects/tutti/files"/> - <item name="Roadmap" + <item name="Roadmap" target="forge" href="http://forge.codelutin.com/projects/tutti/roadmap"/> <item name="Historique des versions" href="changes-report.html"/> </menu> + <menu name="Documentation utilisateur"> + <item name="Aide en ligne (FR)" href="./help/fr/index.html" + target="help"/> + <item name="Aide en ligne (EN)" href="./help/en/index.html" + target="help"/> + </menu> + <menu name="Documentation Technique"> <item name="Configuration" href="./application-config-report.html"/> <item name="Référentiel" href="./referential.html"/>