- Echobase-commits - mailman.cloud.codelutin.com

r549 - trunk
by tchemit＠users.forge.codelutin.com 07 Aug '12

07 Aug '12

Author: tchemit Date: 2012-08-07 09:52:43 +0200 (Tue, 07 Aug 2012) New Revision: 549 Url: http://forge.codelutin.com/repositories/revision/echobase/549 Log: updates to mavenpom 3.3.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 12:49:06 UTC (rev 548) +++ trunk/pom.xml 2012-08-07 07:52:43 UTC (rev 549) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.4-SNAPSHOT</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r548 - in trunk/echobase-ui/src/main/resources: . fr/ifremer/echobase/ui/actions/dbeditor fr/ifremer/echobase/ui/actions/exportQuery fr/ifremer/echobase/ui/actions/importData fr/ifremer/echobase/ui/actions/importHistorical fr/ifremer/echobase/ui/actions/user
by tchemit＠users.forge.codelutin.com 09 Jul '12

09 Jul '12

Author: tchemit Date: 2012-07-09 14:49:06 +0200 (Mon, 09 Jul 2012) New Revision: 548 Url: http://forge.codelutin.com/repositories/revision/echobase/548 Log: use validator updates dtd (from apache) Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-clone-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-save-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMap-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importHistorical/Configure-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml trunk/echobase-ui/src/main/resources/validators.xml Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable-doImport-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="importFile"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-clone-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-clone-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-clone-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="query.name"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-save-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-save-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/exportQuery/ManageExportQuery-save-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="query.name"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.voyageId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.voyageId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.missionId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.voyageId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -25,7 +25,7 @@ <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeEsdu-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.voyageId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMap-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMap-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeMap-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.voyageId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeRegion-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.voyageId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport-configureResults-modeVoyage-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="model.voyageId"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/CreateMission-createMission-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -25,7 +25,7 @@ <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importHistorical/Configure-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importHistorical/Configure-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importHistorical/Configure-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="input"> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -22,7 +22,7 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="email"> Modified: trunk/echobase-ui/src/main/resources/validators.xml =================================================================== --- trunk/echobase-ui/src/main/resources/validators.xml 2012-06-20 15:20:48 UTC (rev 547) +++ trunk/echobase-ui/src/main/resources/validators.xml 2012-07-09 12:49:06 UTC (rev 548) @@ -24,7 +24,7 @@ --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator Config 1.0//EN" - "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"> + "http://struts.apache.org/dtds/xwork-validator-config-1.0.dtd"> <validators>  <validator name="int"

1 0

r547 - in trunk: . echobase-ui
by tchemit＠users.forge.codelutin.com 20 Jun '12

20 Jun '12

Author: tchemit Date: 2012-06-20 17:20:48 +0200 (Wed, 20 Jun 2012) New Revision: 547 Url: http://forge.codelutin.com/repositories/revision/echobase/547 Log: updates to mavenpom 3.3.4 + use last deploy mecanism Modified: trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-05-28 11:36:27 UTC (rev 546) +++ trunk/echobase-ui/pom.xml 2012-06-20 15:20:48 UTC (rev 547) @@ -233,8 +233,10 @@ <env>dev</env> <redmine.releaseFiles> - ${basedir}/target/${project.artifactId}-${project.version}.war + ${basedir}/target/${project.build.finalName}.war </redmine.releaseFiles> + + <deployFiles>${basedir}/target/${project.build.finalName}.war</deployFiles> </properties> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 11:36:27 UTC (rev 546) +++ trunk/pom.xml 2012-06-20 15:20:48 UTC (rev 547) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.2</version> + <version>3.3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r546 - in trunk: . echobase-entities echobase-tools/src echobase-ui echobase-ui/src/site src/site
by tchemit＠users.forge.codelutin.com 28 May '12

28 May '12

Author: tchemit Date: 2012-05-28 13:36:27 +0200 (Mon, 28 May 2012) New Revision: 546 Url: http://forge.codelutin.com/repositories/revision/echobase/546 Log: updates dependencies improve site Removed: trunk/echobase-tools/src/site/ Modified: trunk/echobase-entities/pom.xml trunk/echobase-ui/pom.xml trunk/echobase-ui/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/echobase-entities/pom.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -135,7 +135,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <configuration> <defaultPackage>fr.ifremer.echobase.entities</defaultPackage> <fullPackagePath>fr.ifremer.echobase.entities</fullPackagePath> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/echobase-ui/pom.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -340,6 +340,60 @@ <profiles> <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + +  + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils-maven-report-plugin</artifactId> + <version>${nuitonUtilsVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>application-config-report</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <i18nBundleName>${i18n.bundleOutputName}</i18nBundleName> + </configuration> + </plugin> + </plugins> + </reporting> + </profile> + + <profile> <id>selenium</id> <activation> <property> @@ -429,50 +483,5 @@ </profile> - <profile> - <id>deploy-to-demo</id> - <build> - - <defaultGoal>verify</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>demo.codelutin.com</serverId> - <fromFile>target/${project.build.finalName}.war</fromFile> - <url>scpexe://demo.codelutin.com/var/local/echobase/war</url> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>execute-remote-command</goal> - </goals> - <configuration> - <repositoryId>demo.codelutin.com</repositoryId> - <repositoryUrl>scpexe://demo.codelutin.com</repositoryUrl> - <command>( cd /var/local/echobase ; ./deploy.sh ${project.version} )</command> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: trunk/echobase-ui/src/site/site_fr.xml =================================================================== --- trunk/echobase-ui/src/site/site_fr.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/echobase-ui/src/site/site_fr.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -35,10 +35,30 @@ </breadcrumbs> <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> + <item name="A propos" href="./index.html"/> + <item name="Configuration" href="./application-config-report.html"/> </menu> <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.forge.codelutin.com/public/js/maven-site-forge.codelutin.…"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/pom.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1</version> + <version>3.3.2</version> </parent> <groupId>fr.ifremer</groupId> @@ -123,19 +123,19 @@  - <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.9</topiaVersion> - <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> + <eugenePluginVersion>2.4.3-SNAPSHOT</eugenePluginVersion> + <topiaVersion>2.6.10</topiaVersion> + <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonWebVersion>1.10</nuitonWebVersion> + <nuitonWebVersion>1.11</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.1.2</struts2Version> - <jqueryPluginVersion>3.3.0</jqueryPluginVersion> - <seleniumVersion>2.20.0</seleniumVersion> - <h2Version>1.3.165</h2Version> + <struts2Version>2.3.4</struts2Version> + <jqueryPluginVersion>3.3.1</jqueryPluginVersion> + <seleniumVersion>2.21.0</seleniumVersion> + <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.6.4</slf4jVersion> - <jackcessVersion>1.2.6</jackcessVersion> + <jackcessVersion>1.2.7</jackcessVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> @@ -409,7 +409,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> + <artifactId>eugene-maven-plugin</artifactId> <version>${eugenePluginVersion}</version> </plugin> @@ -487,6 +487,46 @@ </build> </profile> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + + </profile> + </profiles> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-18 09:06:28 UTC (rev 545) +++ trunk/src/site/site_fr.xml 2012-05-28 11:36:27 UTC (rev 546) @@ -51,23 +51,23 @@ <version position="right" /> <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="images/struts2-logo.png"/> + img="${project.url}/images/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/restructuredtext-logo.png"/> + img="${project.url}/images/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/jrst-logo.png"/> + img="${project.url}/images/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="images/topia-logo.png"/> + img="${project.url}/images/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/argouml-logo.png"/> + img="${project.url}/images/argouml-logo.png"/> </poweredBy> @@ -113,7 +113,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.url}' + scm='${project.scm.connection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r545 - in trunk/src/site: . resources
by tchemit＠users.forge.codelutin.com 18 Apr '12

18 Apr '12

Author: tchemit Date: 2012-04-18 11:06:28 +0200 (Wed, 18 Apr 2012) New Revision: 545 Url: http://forge.codelutin.com/repositories/revision/echobase/545 Log: use common maven-site js script Removed: trunk/src/site/resources/maven-site-forge.codelutin.com.js Modified: trunk/src/site/site_fr.xml Deleted: trunk/src/site/resources/maven-site-forge.codelutin.com.js =================================================================== --- trunk/src/site/resources/maven-site-forge.codelutin.com.js 2012-04-13 13:14:54 UTC (rev 544) +++ trunk/src/site/resources/maven-site-forge.codelutin.com.js 2012-04-18 09:06:28 UTC (rev 545) @@ -1,82 +0,0 @@ -/* - * #%L - * EchoBase - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -$(document).ready(function () { - - var metas = $('#projectMetas'); - var piwikEnabled = metas.attr('piwikEnabled'); - if (piwikEnabled) { - //Piwik Tracking Code - var piwikId = metas.attr('piwikId'); - if (!piwikId) { - - // default piwikId for forge.codelutin.com - piwikId = 4; - } - - console.log("use Piwik with id = " + piwikId); - var pkBaseURL = "https:" == document.location.protocol ? - "https://piwik.codelutin.com/" : - "http://piwik.codelutin.com/"; - $.getScript(pkBaseURL + "piwik.js", function (data, textStatus, jqxhr) { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", piwikId); - piwikTracker.trackPageView(); - piwikTracker.enableLinkTracking(); - console.log("piwikTracker loaded = " + piwikTracker); - }); - //Piwik Tracking Code - } - var scmwebeditorenabled = metas.attr('scmwebeditorenabled'); - var scm = metas.attr('scm'); - if (scmwebeditorenabled && scm.indexOf("/trunk") > -1) { - - // allow scmwebeditor is enabled and on trunk - - var scmurl = metas.attr('scmwebeditorurl'); - var projectId = metas.attr('projectId'); - var siteSourcesType = metas.attr('siteSourcesType'); - var path; - var pathname = document.location.pathname; - if (pathname.indexOf('target/site') > 0) { - path = pathname.substr(pathname.indexOf('/site')). - replace('/site/', ''); - } else { - if (pathname == '/' + projectId + '/') { - // on / page - path = 'index.html'; - } else { - path = pathname.substr(pathname.indexOf('/' + projectId)). - replace('/' + projectId + '/', ''); - } - } - path = path.replace('.html', '.' + siteSourcesType); - var url = scmurl + "?address=" + scm + "/src/site/" + siteSourcesType + "/" + path; - console.log("Add scmwebeditor with url = " + url); - var html = "<li class='pull-right'><a href='" + url + - "'>Éditer la page</a></li>" + - "<li class='divider pull-right'>|</li>"; - var ul = $('#publishDate'); - ul.prepend(html); - - } -}); \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-13 13:14:54 UTC (rev 544) +++ trunk/src/site/site_fr.xml 2012-04-18 09:06:28 UTC (rev 545) @@ -101,11 +101,12 @@ <menu ref="reports"/> - <menu ref="modules"/> +  <footer> - <script type="text/javascript" src="./maven-site-forge.codelutin.com.js"> + <script type="text/javascript" + src="http://maven-site.forge.codelutin.com/public/js/maven-site-forge.codelutin.…"> </script> <div id='projectMetas'

1 0

r544 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 13 Apr '12

13 Apr '12

Author: maven-release Date: 2012-04-13 15:14:54 +0200 (Fri, 13 Apr 2012) New Revision: 544 Url: http://forge.codelutin.com/repositories/revision/echobase/544 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-13 13:14:47 UTC (rev 543) +++ trunk/echobase-entities/pom.xml 2012-04-13 13:14:54 UTC (rev 544) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-13 13:14:47 UTC (rev 543) +++ trunk/echobase-services/pom.xml 2012-04-13 13:14:54 UTC (rev 544) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-13 13:14:47 UTC (rev 543) +++ trunk/echobase-tools/pom.xml 2012-04-13 13:14:54 UTC (rev 544) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-13 13:14:47 UTC (rev 543) +++ trunk/echobase-ui/pom.xml 2012-04-13 13:14:54 UTC (rev 544) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 13:14:47 UTC (rev 543) +++ trunk/pom.xml 2012-04-13 13:14:54 UTC (rev 544) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0</version> + <version>1.1-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.0</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.0 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.0 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r543 - tags
by maven-release＠users.forge.codelutin.com 13 Apr '12

13 Apr '12

Author: maven-release Date: 2012-04-13 15:14:47 +0200 (Fri, 13 Apr 2012) New Revision: 543 Url: http://forge.codelutin.com/repositories/revision/echobase/543 Log: [maven-release-plugin] copy for tag echobase-1.0 Added: tags/echobase-1.0/

1 0

r542 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 13 Apr '12

13 Apr '12

Author: maven-release Date: 2012-04-13 15:14:39 +0200 (Fri, 13 Apr 2012) New Revision: 542 Url: http://forge.codelutin.com/repositories/revision/echobase/542 Log: [maven-release-plugin] prepare release echobase-1.0 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-13 12:56:58 UTC (rev 541) +++ trunk/echobase-entities/pom.xml 2012-04-13 13:14:39 UTC (rev 542) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-13 12:56:58 UTC (rev 541) +++ trunk/echobase-services/pom.xml 2012-04-13 13:14:39 UTC (rev 542) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-13 12:56:58 UTC (rev 541) +++ trunk/echobase-tools/pom.xml 2012-04-13 13:14:39 UTC (rev 542) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-13 12:56:58 UTC (rev 541) +++ trunk/echobase-ui/pom.xml 2012-04-13 13:14:39 UTC (rev 542) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 12:56:58 UTC (rev 541) +++ trunk/pom.xml 2012-04-13 13:14:39 UTC (rev 542) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.0</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.0 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.0 </developerConnection> </scm>

1 0

r541 - in trunk: echobase-ui/src/main/resources/i18n src/site/rst
by tchemit＠users.forge.codelutin.com 13 Apr '12

13 Apr '12

Author: tchemit Date: 2012-04-13 14:56:58 +0200 (Fri, 13 Apr 2012) New Revision: 541 Url: http://forge.codelutin.com/repositories/revision/echobase/541 Log: refs #484: Documentation Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/src/site/rst/index.rst Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-13 12:36:56 UTC (rev 540) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-13 12:56:58 UTC (rev 541) @@ -20,7 +20,7 @@ echobase.action.importTable=Importer echobase.action.locale.english=Anglais echobase.action.locale.french=Français -echobase.action.login=Connection +echobase.action.login=Connexion echobase.action.logout=Déconnexion echobase.action.newLibreOfficeQuery=Nouvelle requète Libre office echobase.action.newQuery=Nouvelle requète Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-04-13 12:36:56 UTC (rev 540) +++ trunk/src/site/rst/index.rst 2012-04-13 12:56:58 UTC (rev 541) @@ -33,9 +33,17 @@ Les documents ------------- + - La documentation d'`installation`_. + - La description du `modèle`_. -.. _installation: install.html -.. _modèle: model.html +- La description des `imports`_. +- Comment créer une `application embarquée`_. + +.. _installation: ./install.html +.. _modèle: ./model.html +.. _imports: ./imports.html +.. _application embarquée: ./embedded.html +

1 0

r540 - in trunk/src/site: . rst
by tchemit＠users.forge.codelutin.com 13 Apr '12

13 Apr '12

Author: tchemit Date: 2012-04-13 14:36:56 +0200 (Fri, 13 Apr 2012) New Revision: 540 Url: http://forge.codelutin.com/repositories/revision/echobase/540 Log: refs #484: Documentation (ajout d'exemples) Modified: trunk/src/site/rst/imports.rst trunk/src/site/site_fr.xml Modified: trunk/src/site/rst/imports.rst =================================================================== --- trunk/src/site/rst/imports.rst 2012-04-13 12:05:18 UTC (rev 539) +++ trunk/src/site/rst/imports.rst 2012-04-13 12:36:56 UTC (rev 540) @@ -21,9 +21,9 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - -======================================= +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Liste des colonnes des imports EchoBase -======================================= +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. contents:: Table des matières :depth: 2 @@ -33,11 +33,12 @@ :depth: 2 Abstract --------- +======== Ce document donne la définition de tous les imports. -Sur les types : +Format des colonnes +~~~~~~~~~~~~~~~~~~~ - FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy). - (int) un entier (pas du nullité possible) @@ -50,21 +51,59 @@ - (esdu cell) nom de cellule esdu - elementary : esduName[_elementaryCellName] avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS +Note importantes +~~~~~~~~~~~~~~~~ + +- Le nom des colonnes est sensible à la casse, il faut donc bien respecter les + noms donnés dans cette page. + +- Le contenu des cellules (et aussi les nom de colonnes) peuvent être encapsulés + par des **"**. + + Voyage / Transit / Transect ---------------------------- +=========================== Voyage ~~~~~~ +Colonnes requises +----------------- + +:: + + name;startDate;endDate;startPort;endPort + +Format des colonnes +------------------- + - name - startDate (date) - endDate (date) - startPort - endPort +Exemple +------- + +:: + + name;startDate;endDate;startPort;endPort + PELGAS2011;2011-04-26 08:00:00.0000;2011-06-04 17:00:01.0000;Santander;Concarneau + Transit ~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;description;startTime;endTime;startLocality;endLocality + +Format des colonnes +------------------- + - voyage FK(voyage#name) - description - startTime (date) @@ -72,9 +111,27 @@ - startLocality - endLocality +Exemple +------- + +:: + + voyage;description;startTime;endTime;startLocality;endLocality + PELGAS2011;PELGAS11CAMP1;2011-04-26 08:00:01.0000;2011-05-08 20:00:00.0000;Santander;La Rochelle + Transect ~~~~~~~~ +Colonnes requises +----------------- + +:: + + title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring + +Format des colonnes +------------------- + - voyage FK(voyage#name) - vesselName FK(Vessel#name) - title @@ -92,12 +149,30 @@ - geospatialVerticalMax (float) - linestring +Exemple +------- + +:: + + title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring + Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000";-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037 + Operation / OperationMetadataValue / GearMetadataValue ------------------------------------------------------- +====================================================== Operation ~~~~~~~~~ +Colonnes requises +----------------- + +:: + + vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode + +Format des colonnes +------------------- + - vesselName FK(Vessel#name) - gearCode FK(Gear#casinoGearName) - depthStratumId FK(DepthStratum#id) @@ -111,29 +186,83 @@ - gearShootingStartLongitude (float) - gearShootingEndLongitude (float) +Exemple +------- + +:: + + vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode + THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52 + OperationMetadataValue ~~~~~~~~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + vesselName;operationId;metadataType;operationMetadataValue + +Format des colonnes +------------------- + - vesselName FK(Vessel#name) - operationId FK(Operation#id) - metadataType FK(OperationMetadata#name) - operationMetadataValue +Exemple +------- + +:: + + vesselName;operationId;metadataType;operationMetadataValue + THALASSA II;P0422;MeanWaterDepth";43.42 + GearMetadataValue ~~~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + vesselName;operationId;gearCode;metadataType;gearMetadataValue + +Format des colonnes +------------------- + - vesselName FK(Vessel#name) - operationId FK(Operation#id) - metadataType FK(GearMetadata#name) - gearCode FK(Gear#casinoGearName) - gearMetadataValue +Exemple +------- + +:: + + vesselName;operationId;gearCode;metadataType;gearMetadataValue + THALASSA II;P0422;57x52;CableLength";31.6666666666667 + TotalSample / SubSample / BiometrySample ----------------------------------------- +======================================== TotalSample ~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight + +Format des colonnes +------------------- + - operationId FK(Operation#id) - baracoudaCode FK(Species#baracoudaCode) - sizeCategory FK(SizeCategory#name) @@ -144,9 +273,27 @@ - noPerKg (Float-NA) - sortedWeight (float) +Exemple +------- + +:: + + operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight + P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03 + SubSample ~~~~~~~~~ +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + +Format des colonnes +------------------- + - operationId FK(Operation#id) - baracoudaCode FK(Species#baracoudaCode) - sizeCategory FK(SizeCategory#name) @@ -159,9 +306,27 @@ (colonnes ignorées) subHaul units round +Exemple +------- + +:: + + operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round + P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 + BiometrySample ~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + operationId;baracoudaCode;numFish;dataLabel;dataValue;name + +Format des colonnes +------------------- + - operationId FK(Operation#id) - baracoudaCode FK(Species#baracoudaCode) - numFish (int) @@ -169,26 +334,80 @@ - dataLabel - dataValue (Float-NA) +Exemple +------- + +:: + + operationId;baracoudaCode;numFish;dataLabel;dataValue;name + P5002;ENGR-ENC";9394;NA;-1;"Age + Acoustic --------- +======== +Colonnes requises +----------------- + +:: + + MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality + +Format des colonnes +------------------- + A faire... +Exemple +------- + +:: + + MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality + 2011/06/23 10:09:00.0000";NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;"2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000";43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;"variable";1 + Résultats voyage ----------------- +================ Echotype ~~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;echotypeName;depthStratumId;meaning;baracoudaCode + +Format des colonnes +------------------- + - echotypeName - meaning - voyage FK(Voyage#name) - depthStratumId FK(DepthStratum#id) - baracoudaCode FK(Species#baracoudaCode) +Exemple +------- + +:: + + voyage;echotypeName;depthStratumId;meaning;baracoudaCode + PELGAS2011;D1;CLAS;Maquereaux, Chinchards et gadidés présents dans les couches à proximité du fond;COMP-LEM + LengthWeightKey ~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata + +Format des colonnes +------------------- + - aParameter (float) - bParameter (float) - voyage FK(Voyage#name) @@ -196,9 +415,27 @@ - baracoudaCode FK(Species#baracoudaCode) - strata FK(Strata#name) +Exemple +------- + +:: + + voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata + PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne + LengthAgeKey ~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;baracoudaCode;age;length;percentAtAge;metadata;strata + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - age (int) - length (float) @@ -207,57 +444,147 @@ - strata FK(Strata#name) - baracoudaCode FK(Species#baracoudaCode) +Exemple +------- + +:: + + voyage;baracoudaCode;age;length;percentAtAge;metadata;strata + PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne + Résultats Esdu --------------- +============== Esdu / Echotype ~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - name FK(esdu cell) - echotype FK(Echotype#name) - dataQuality FK(DataQuality#qualityDataFlagValues) -- ... DataMetadata#name ... +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +Exemple +------- + +:: + + voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality + PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1 + Esdu / Echotype / Species Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - name FK(esdu cell) - echotype FK(Echotype#name) - sizeCategory FK(SizeCategory#name) - baracoudaCode FK(Species#baracoudaCode) - dataQuality FK(DataQuality#qualityDataFlagValues) -- ... DataMetadata#name ... +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +Exemple +------- + +:: + + voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality + PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + Esdu / Species / Age Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - name FK(esdu cell) - baracoudaCode FK(Species#baracoudaCode) - ageCategory - ageCategoryMeaning - dataQuality FK(DataQuality#qualityDataFlagValues) -- ... DataMetadata#name ... +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +Exemple +------- + +:: + + name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;ENGR-ENC";3;3377.00492644042;"fish age-group (years)";1;"PELGAS2011 + Esdu / Species / Size Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - name FK(esdu cell) - baracoudaCode FK(Species#baracoudaCode) - sizeCategory - sizeCategoryMeaning - dataQuality FK(DataQuality#qualityDataFlagValues) -- ... DataMetadata#name ... +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +Exemple +------- + +:: + + name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage + 2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011 + Region ------- +====== Region ~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;name;cellType;regionEnvCoordinates;surface;dataQuality + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - cellType FK(CellType) - dataQuality FK(DataQuality#qualityDataFlagValues) @@ -265,27 +592,81 @@ - regionEnvCoordinates - surface (float) +Exemple +------- + +:: + + voyage;name;cellType;regionEnvCoordinates;surface;dataQuality + PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1 + Region Association ~~~~~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;regionName;esduName + +Format des colonnes +------------------- + - voyage FK(Voyage) - regionName FK(Cell#name) - esduName FK(Cell#name) +Exemple +------- + +:: + + voyage;regionName;esduName + PELGAS2011";1;"2011-05-02 09:36:54.0000 + Region results ~~~~~~~~~~~~~~ +Colonnes requises +----------------- + +:: + + voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - name FK(Cell#name) - baracoudaCode FK(Species#baracoudaCode) - echotype FK(Echotype#name) - sizeCategory FK(SizeCategory#name) - dataQuality FK(DataQuality#qualityDataFlagValues) -- ... DataMetadata#name ... +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +Exemple +------- + +:: + + voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality + PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 + Map ---- +=== +Colonnes requises +----------------- + +:: + + voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality + +Format des colonnes +------------------- + - voyage FK(Voyage#name) - name - baracoudaCode FK(Species#baracoudaCode) @@ -298,20 +679,12 @@ - gridLongitudeLag (float) - gridLatitudeLag (float) - gridDepthLag (float) -- ... DataMetadata#name ... +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +Exemple +------- +:: - - - - - - - - - - - - - + voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality + PELGAS2011;-6 43.5 0;ENGR-ENC";0;;-6;43.5;0;0.25;0.25;0;0;1 Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-13 12:05:18 UTC (rev 539) +++ trunk/src/site/site_fr.xml 2012-04-13 12:36:56 UTC (rev 540) @@ -34,12 +34,6 @@ <custom> <fluidoSkin> <topBarEnabled>true</topBarEnabled> -  <googleSearch/> <sideBarEnabled>false</sideBarEnabled> <searchEnabled>true</searchEnabled>

1 0