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

r623 - in trunk: . echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb
by tchemit＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: tchemit Date: 2012-09-05 18:05:37 +0200 (Wed, 05 Sep 2012) New Revision: 623 Url: http://forge.codelutin.com/repositories/revision/echobase/623 Log: fixes #1459: Improve usage of memory for exportDb Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java trunk/pom.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-05 11:19:56 UTC (rev 622) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-05 16:05:37 UTC (rev 623) @@ -105,8 +105,7 @@ List<TopiaEntity> entities = getEntities(meta, pager, sidx, - ascendantOrder, - null + ascendantOrder ); Map<?, ?>[] rows = new Map[entities.size()]; @@ -125,8 +124,7 @@ public <E extends TopiaEntity> List<E> getEntities(TableMeta<EchoBaseEntityEnum> tableMeta, TopiaFilterPagerUtil.FilterPagerBean pager, String sidx, - Boolean ascendantOrder, - String extraWhereQuery) { + Boolean ascendantOrder) { //TODO-tchemit-2012-08-19 Replace TopiaQuery with simple hql query List<E> result; @@ -281,14 +279,6 @@ } query.setLimit(from, to - 1); - if (StringUtils.isNotEmpty(extraWhereQuery)) { - query.addWhere(extraWhereQuery); - } - } else { - - if (StringUtils.isNotEmpty(extraWhereQuery)) { - query.addWhere(extraWhereQuery); - } } result = dao.findAllByQuery(query); return result; @@ -297,6 +287,24 @@ } } + public <E extends TopiaEntity> Iterable<E> getEntities(TableMeta<EchoBaseEntityEnum> tableMeta, + String extraWhereQuery) { + + try { + TopiaDAO<E> dao = (TopiaDAO<E>) getDAO(tableMeta.getSource().getContract()); + + String hql = "FROM " + + dao.getTopiaEntityEnum().getImplementationFQN()+" e"; + if (extraWhereQuery != null) { + hql += " WHERE " + extraWhereQuery; + } + Iterable<E> result = dao.findAllLazyByQuery(1000, hql); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException("Could not obtain data", eee); + } + } + public Map<?, ?> getData(TableMeta<EchoBaseEntityEnum> tableMeta, String topiaId) { EchoBaseEntityEnum entityEnum = tableMeta.getSource(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2012-09-05 11:19:56 UTC (rev 622) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2012-09-05 16:05:37 UTC (rev 623) @@ -44,7 +44,6 @@ import org.nuiton.util.decorator.Decorator; import java.io.File; -import java.util.List; /** * To export datas from db to csv files. @@ -325,19 +324,19 @@ private PrepareDataForExport<EchoBaseEntityEnum> defaultPrepareDataForExport = new PrepareDataForExport<EchoBaseEntityEnum>() { @Override - public <E extends TopiaEntity> List<E> prepareData(TableMeta<EchoBaseEntityEnum> tableMeta) { + public <E extends TopiaEntity> Iterable<E> prepareData(TableMeta<EchoBaseEntityEnum> tableMeta) { DbEditorService service = getService(DbEditorService.class); - List<E> data = service.getEntities(tableMeta, null, null, null, null); + Iterable<E> data = service.getEntities(tableMeta, null); return data; } @Override - public <E extends TopiaEntity> List<E> prepareData(AssociationMeta<EchoBaseEntityEnum> associationMeta) { + public <E extends TopiaEntity> Iterable<E> prepareData(AssociationMeta<EchoBaseEntityEnum> associationMeta) { DbEditorService service = getService(DbEditorService.class); TableMeta<EchoBaseEntityEnum> tableMeta = service.getTableMeta(associationMeta.getSource()); - List<E> data = service.getEntities(tableMeta, null, null, null, "size(e." + associationMeta.getName() + ") > 0"); + Iterable<E> data = service.getEntities(tableMeta, "size(e." + associationMeta.getName() + ") > 0"); return data; } }; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 11:19:56 UTC (rev 622) +++ trunk/pom.xml 2012-09-05 16:05:37 UTC (rev 623) @@ -63,10 +63,8 @@ <timezone>Europe/Paris</timezone> </developer> - </developers> - - <contributors> - <contributor> + <developer> + <id>mdoray</id> <name>Mathieu Doray</name> <email>mathieu dot doray at ifremer dot fr</email> <organization>Ifremer</organization> @@ -75,9 +73,10 @@ <role>document writer</role> </roles> <timezone>Europe/Paris</timezone> - </contributor> - </contributors> + </developer> + </developers> + <scm> <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> @@ -134,7 +133,7 @@  <eugenePluginVersion>2.5</eugenePluginVersion> - <topiaVersion>2.6.13</topiaVersion> + <topiaVersion>2.6.14-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>2.6.1</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion>

1 0

r622 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: maven-release Date: 2012-09-05 13:19:56 +0200 (Wed, 05 Sep 2012) New Revision: 622 Url: http://forge.codelutin.com/repositories/revision/echobase/622 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-09-05 11:19:49 UTC (rev 621) +++ trunk/echobase-domain/pom.xml 2012-09-05 11:19:56 UTC (rev 622) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-09-05 11:19:49 UTC (rev 621) +++ trunk/echobase-services/pom.xml 2012-09-05 11:19:56 UTC (rev 622) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-09-05 11:19:49 UTC (rev 621) +++ trunk/echobase-tools/pom.xml 2012-09-05 11:19:56 UTC (rev 622) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-05 11:19:49 UTC (rev 621) +++ trunk/echobase-ui/pom.xml 2012-09-05 11:19:56 UTC (rev 622) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 11:19:49 UTC (rev 621) +++ trunk/pom.xml 2012-09-05 11:19:56 UTC (rev 622) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1</version> + <version>1.2-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -79,12 +79,12 @@ </contributors> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.1</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.1 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.1 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r621 - tags
by maven-release＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: maven-release Date: 2012-09-05 13:19:49 +0200 (Wed, 05 Sep 2012) New Revision: 621 Url: http://forge.codelutin.com/repositories/revision/echobase/621 Log: [maven-release-plugin] copy for tag echobase-1.1 Added: tags/echobase-1.1/

1 0

r620 - in trunk: . echobase-domain echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: maven-release Date: 2012-09-05 13:19:42 +0200 (Wed, 05 Sep 2012) New Revision: 620 Url: http://forge.codelutin.com/repositories/revision/echobase/620 Log: [maven-release-plugin] prepare release echobase-1.1 Modified: trunk/echobase-domain/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2012-09-05 11:17:51 UTC (rev 619) +++ trunk/echobase-domain/pom.xml 2012-09-05 11:19:42 UTC (rev 620) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -11,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-09-05 11:17:51 UTC (rev 619) +++ trunk/echobase-services/pom.xml 2012-09-05 11:19:42 UTC (rev 620) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-09-05 11:17:51 UTC (rev 619) +++ trunk/echobase-tools/pom.xml 2012-09-05 11:19:42 UTC (rev 620) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-05 11:17:51 UTC (rev 619) +++ trunk/echobase-ui/pom.xml 2012-09-05 11:19:42 UTC (rev 620) @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> @@ -365,7 +363,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${embeddedWarDir}/WEB-INF/classes"/> + <mkdir dir="${embeddedWarDir}/WEB-INF/classes" /> </target> </configuration> <goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 11:17:51 UTC (rev 619) +++ trunk/pom.xml 2012-09-05 11:19:42 UTC (rev 620) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1</version> <modules> <module>echobase-domain</module> @@ -79,12 +79,12 @@ </contributors> <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-1.1 </developerConnection> </scm>

1 0

r619 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb
by tchemit＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: tchemit Date: 2012-09-05 13:17:51 +0200 (Wed, 05 Sep 2012) New Revision: 619 Url: http://forge.codelutin.com/repositories/revision/echobase/619 Log: fix import Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2012-09-05 10:17:22 UTC (rev 618) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2012-09-05 11:17:51 UTC (rev 619) @@ -27,7 +27,7 @@ import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.persistence.EchoBaseEntityHelper; import fr.ifremer.echobase.persistence.JdbcConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.sql.SQLException;

1 0

r618 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb
by tchemit＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: tchemit Date: 2012-09-05 12:17:22 +0200 (Wed, 05 Sep 2012) New Revision: 618 Url: http://forge.codelutin.com/repositories/revision/echobase/618 Log: try to improve export memory usage Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2012-09-05 10:16:51 UTC (rev 617) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2012-09-05 10:17:22 UTC (rev 618) @@ -23,10 +23,14 @@ */ package fr.ifremer.echobase.services.exportdb; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.services.DecoratorService; import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.csv.EntityCsvModel; import org.nuiton.topia.persistence.csv.out.EntityAssociationExportModel; @@ -49,10 +53,10 @@ * @since 0.2 */ public class ExportService extends EchoBaseServiceSupport { -// -// /** Logger. */ -// private static final Log log = LogFactory.getLog(ExportService.class); -// + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportService.class); + // public static final TimeLog TIME_LOG = new TimeLog(ExportService.class); // public ExportModelFactory<EchoBaseEntityEnum> getDefaultExportFactory() { @@ -121,9 +125,12 @@ // return model; // } - public String exportData(TableMeta<EchoBaseEntityEnum> tableMeta, boolean asSeen) { + public String exportData(TableMeta<EchoBaseEntityEnum> meta, boolean asSeen) { - String result = TopiaCsvExports.exportData(tableMeta, + if (log.isInfoEnabled()) { + log.info("Export " + meta); + } + String result = TopiaCsvExports.exportData(meta, getModelFactory(asSeen), defaultPrepareDataForExport); return result; @@ -137,13 +144,18 @@ // } } - public void exportData(TableMeta<EchoBaseEntityEnum> tableMeta, File file) { + public void exportData(TableMeta<EchoBaseEntityEnum> meta, File file) { - TopiaCsvExports.exportData(tableMeta, + if (log.isInfoEnabled()) { + log.info("Export " + meta + " to " + file); + } + + TopiaCsvExports.exportData(meta, defaultExportFactory, defaultPrepareDataForExport, file); + clearCache(); // if (log.isInfoEnabled()) { // log.info("Export table " + tableMeta + " to " + file); // } @@ -159,12 +171,18 @@ // TIME_LOG.log(s2, "exportData::exportToFile"); } - public void exportData(AssociationMeta<EchoBaseEntityEnum> associationMeta, File file) { - TopiaCsvExports.exportData(associationMeta, + public void exportData(AssociationMeta<EchoBaseEntityEnum> meta, File file) { + + if (log.isInfoEnabled()) { + log.info("Export " + meta + " to " + file); + } + TopiaCsvExports.exportData(meta, defaultExportFactory, defaultPrepareDataForExport, file); + + clearCache(); // if (log.isInfoEnabled()) { // log.info("Export association " + associationMeta + " to " + file); // } @@ -212,6 +230,14 @@ // return Export.newExport(model, datas); // } + protected void clearCache() { + try { + getTransaction().clearCache(); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException("Could not clear db cache", e); + } + } + private ExportModelFactory<EchoBaseEntityEnum> defaultExportFactory = new ExportModelFactory<EchoBaseEntityEnum>() { @Override

1 0

r617 - trunk/src/site
by tchemit＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: tchemit Date: 2012-09-05 12:16:51 +0200 (Wed, 05 Sep 2012) New Revision: 617 Url: http://forge.codelutin.com/repositories/revision/echobase/617 Log: fix typo Modified: trunk/src/site/site_en.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-09-05 09:29:19 UTC (rev 616) +++ trunk/src/site/site_en.xml 2012-09-05 10:16:51 UTC (rev 617) @@ -100,7 +100,7 @@ <menu name="Utilisateur"> <item name="Home" href="index.html"/> <item name="Installation" href="install.html"/> - <item name="Embbeded Application" href="embedded.html"/> + <item name="Portable Application" href="embedded.html"/> <item name="Imports" href="imports.html"/> <item name="Model" href="model.html"/> <item name="Download"

1 0

r616 - trunk/echobase-ui
by tchemit＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: tchemit Date: 2012-09-05 11:29:19 +0200 (Wed, 05 Sep 2012) New Revision: 616 Url: http://forge.codelutin.com/repositories/revision/echobase/616 Log: repush back release-profile (will use the prod env) Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-05 09:26:02 UTC (rev 615) +++ trunk/echobase-ui/pom.xml 2012-09-05 09:29:19 UTC (rev 616) @@ -328,6 +328,19 @@ <profiles> <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <env>prod</env> + </properties> + </profile> + + <profile> <id>assembly</id> <activation> <property>

1 0

r615 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase echobase-domain/src/main/resources/i18n echobase-ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp echobase-ui/src/main/webapp/WEB-INF/jsp/importData
by tchemit＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: tchemit Date: 2012-09-05 11:26:02 +0200 (Wed, 05 Sep 2012) New Revision: 615 Url: http://forge.codelutin.com/repositories/revision/echobase/615 Log: improve documentation access Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-09-05 09:26:02 UTC (rev 615) @@ -34,6 +34,7 @@ import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.Map; import java.util.Properties; @@ -152,13 +153,6 @@ return file; } -// public File getWarDirectory() { -// File file = applicationConfig.getOptionAsFile( -// EchoBaseConfigurationOption.WAR_DIRECTORY.key); -// Preconditions.checkNotNull(file); -// return file; -// } - public File getWarLocation() { File file = applicationConfig.getOptionAsFile( EchoBaseConfigurationOption.WAR_LOCATION.key); @@ -200,6 +194,12 @@ return result != null && result; } + public URL getDocumentationUrl() { + URL result = applicationConfig.getOptionAsURL( + EchoBaseConfigurationOption.DOCUMENTATION_URL.key); + return result; + } + public boolean getOptionAsBoolean(String propertyName) { Boolean result = applicationConfig.getOptionAsBoolean(propertyName); return result != null && result; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2012-09-05 09:26:02 UTC (rev 615) @@ -26,6 +26,7 @@ import org.nuiton.util.Version; import java.io.File; +import java.net.URL; import static org.nuiton.i18n.I18n.n_; @@ -64,7 +65,11 @@ WAR_LOCATION("echobase.war.location", n_("echobase.config.war.location.description"), "${echobase.data.directory}/war/echobase-ui-${echobase.version}-embedded.war", - File.class); + File.class), + DOCUMENTATION_URL("echobase.documentationUrl", + n_("echobase.config.documentationUrl.description"), + "http://maven-site.forge.codelutin.com/echobase", + URL.class); /** Configuration key. */ protected final String key; Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-05 09:26:02 UTC (rev 615) @@ -2,6 +2,7 @@ echobase.common.driverType.postgres=Postgresql Database echobase.config.csv.separator.description=Csv separator character echobase.config.data.directory.description=Path to application data +echobase.config.documentationUrl.description=Where to find EchoBase online documentation echobase.config.embedded.description=Flag used for embedded application (will create a h2 working db configuration to access database) echobase.config.h2Version.description=H2 jdbc driver version echobase.config.internal.db.directory.description=Directory of the internal database Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-05 09:26:02 UTC (rev 615) @@ -2,6 +2,7 @@ echobase.common.driverType.postgres=Base Postgresql echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application +echobase.config.documentationUrl.description=Où trouver la documentation en ligne d'EchoBase echobase.config.embedded.description=Pour créer au démarrage une configuration vers la base h2 embarquée (uniquement pour les applications embarquées) echobase.config.h2Version.description=Version du pilote jdbc H2 echobase.config.internal.db.directory.description=Répertoire de la base interne Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/pom.xml 2012-09-05 09:26:02 UTC (rev 615) @@ -81,7 +81,7 @@ </configuration> </execution> <execution> - <id>parseOthersAndGenBundle</id> + <id>parseOthersAndGen</id> <goals> <goal>parserValidation</goal> <goal>parserJava</goal> @@ -89,6 +89,15 @@ <goal>bundle</goal> </goals> </execution> + <execution> + <id>bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <configuration> + <showEmpty>true</showEmpty> + </configuration> + </execution> </executions> </plugin> Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2012-09-05 09:26:02 UTC (rev 615) @@ -39,6 +39,7 @@ import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.EchoBaseWorkingDbTransactionFilter; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.struts2.interceptor.ParameterAware; import org.apache.struts2.interceptor.SessionAware; import org.nuiton.topia.persistence.TopiaEntity; @@ -48,6 +49,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Map; /** @@ -229,6 +231,26 @@ } } + public String getDocumentation(String page) { + return getDocumentation(page, null); + } + + public String getDocumentation(String page, String anchor) { + Locale locale = getLocale(); + String result = getConfiguration().getDocumentationUrl().toString(); + if (!result.endsWith("/")) { + result += "/"; + } + if (Locale.ENGLISH.getLanguage().equals(locale.getLanguage())) { + result += "en/"; + } + result += page; + if (StringUtils.isNotBlank(anchor)) { + result += "#" + anchor; + } + return result; + } + public boolean hasAnyErrors() { boolean result = super.hasErrors(); return result || hasFlashErrors(); Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-05 09:26:02 UTC (rev 615) @@ -155,13 +155,13 @@ echobase.header.request.result=SQL query result echobase.info.click.to.select=You can select value with a simple click then copy it (Ctrl-C) echobase.info.dbeditor.propertyDiffsResult=Data import results +echobase.info.documentation=EchoBase online documentation echobase.info.downloadEchoBase=Download application and import files echobase.info.echoBaseForge=Project Forge +echobase.info.echoR=EchoR project echobase.info.exportDb.archive=Basebame of the archive, extension <strong>.zip</strong> will be added to it. echobase.info.import.failed=Import failed echobase.info.import.succeded=Successful import -echobase.info.lastDevDocumentation=Current documentation (will be available at next stable version) -echobase.info.lastStableDocumentation=Last stable version documentation echobase.info.new.sqlQuery.inprogress=Query creation in progress echobase.info.new.workingDbConfiguration.inprogress=New working database configuration in progress echobase.info.no.sqlQuery.saved=No saved SQL query 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-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-05 09:26:02 UTC (rev 615) @@ -155,13 +155,13 @@ echobase.header.request.result=Résultat de la requête SQL echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données +echobase.info.documentation=Documentation en ligne d'EchoBase echobase.info.downloadEchoBase=Téléchargement de l'application et des fichiers d'import echobase.info.echoBaseForge=Gestion du projet +echobase.info.echoR=Projet EchoR echobase.info.exportDb.archive=Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> sera automatiquement rajoutée. echobase.info.import.failed=L'import a échoué echobase.info.import.succeded=L'import a réussi -echobase.info.lastDevDocumentation=Documentation en cours (disponible dans la prochaine version stable) -echobase.info.lastStableDocumentation=Documentation de la dernière version stable echobase.info.new.sqlQuery.inprogress=Nouvelle requête en cours de création echobase.info.new.workingDbConfiguration.inprogress=Nouvelle configuration de base de travail en cours de création echobase.info.no.sqlQuery.saved=Aucune requête d'export SQL enregistrée @@ -264,7 +264,7 @@ echobase.title.newLibreOfficeQuery=Traduire une requête SQL issue de Libre Office echobase.title.users=Administration des utilisateurs echobase.title.welcome=Bienvenue dans EchoBase -echobase.title.workingDbConfiguration=Administration des configuration de bases de travail +echobase.title.workingDbConfiguration=Administration des configurations de base de travail echobase.tooltip.disconnectWorkingDb=Changer de base de travail echobase.tooltip.logout=Se déconnecter echobase.tooltip.selectWorkingDb=Sélectionner une base de travail Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2012-09-05 09:26:02 UTC (rev 615) @@ -23,6 +23,7 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <title><s:text name="echobase.title.welcome"/></title> <div class="fontsize11"> @@ -32,24 +33,16 @@ </legend> <ul> <li> - <s:a href="http://maven-site.forge.codelutin.com/echobase" - target='#stableDoc'> - <s:text name="echobase.info.lastStableDocumentation"/> + <s:a href="%{getDocumentation('index.html')}" target='#doc'> + <s:text name="echobase.info.documentation"/> </s:a> </li> <li> - <s:a href="http://maven-site.forge.codelutin.com/echobase/SNAPSHOT" - target='#devDoc'> - <s:text name="echobase.info.lastDevDocumentation"/> + <s:a href="https://forge.ifremer.fr/www/echor" target='#doc'> + <s:text name="echobase.info.echoR"/> </s:a> </li> <li> - <s:a href="http://forge.codelutin.com/projects/echobase/files" - target='#forge'> - <s:text name="echobase.info.downloadEchoBase"/> - </s:a> - </li> - <li> <s:a href="http://forge.codelutin.com/projects/echobase" target='#forge'> <s:text name="echobase.info.echoBaseForge"/> @@ -57,4 +50,15 @@ </li> </ul> </fieldset> -</div> \ No newline at end of file +</div> + +<s:if test="!workingDbSelected"> + <s:form namespace="/workingDb" action="showList"> + <ul class="toolbar floatLeft"> + <li> + <s:submit theme="simple" action="showList" + key="echobase.action.workingDbconfiguration.connect"/> + </li> + </ul> + </s:form> +</s:if> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-05 09:26:02 UTC (rev 615) @@ -53,8 +53,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#acoustic" - target="doc"> + <s:a href="%{getDocumentation('imports.html','acoustic')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-05 09:26:02 UTC (rev 615) @@ -46,7 +46,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#totalsample-sub…" + <s:a href="%{getDocumentation('imports.html','totalsample-subsample-biometrysample')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-05 09:26:02 UTC (rev 615) @@ -61,7 +61,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#voyage-transit-…" + <s:a href="%{getDocumentation('imports.html','voyage-transit-transect')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> @@ -130,7 +130,7 @@ <s:hidden key="model.importMode" value="TRANSECT" label=''/> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#voyage-transit-…" + <s:a href="%{getDocumentation('imports.html','voyage-transit-transect')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-05 09:26:02 UTC (rev 615) @@ -40,7 +40,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#operation-opera…" + <s:a href="%{getDocumentation('imports.html','operation-operationmetadatavalue-gearmetadatavalue')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-05 07:35:48 UTC (rev 614) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-05 09:26:02 UTC (rev 615) @@ -70,7 +70,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#r-sultats-voyage" + <s:a href="%{getDocumentation('imports.html','r-sultats-voyag')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> @@ -111,7 +111,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#r-sultats-esdu" + <s:a href="%{getDocumentation('imports.html','r-sultats-esdu')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> @@ -162,8 +162,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#region" - target="doc"> + <s:a href="%{getDocumentation('imports.html','region')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div> @@ -203,8 +202,7 @@ </legend> <div class="cleanBoth help"> - <s:a href="http://maven-site.forge.codelutin.com/echobase/imports.html#map" - target="doc"> + <s:a href="%{getDocumentation('imports.html','map')}" target="doc"> <s:text name="echobase.action.show.import.documentation"/> </s:a> </div>

1 0

r614 - trunk/echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 05 Sep '12

05 Sep '12

Author: tchemit Date: 2012-09-05 09:35:48 +0200 (Wed, 05 Sep 2012) New Revision: 614 Url: http://forge.codelutin.com/repositories/revision/echobase/614 Log: optimize i18n Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-04 20:55:46 UTC (rev 613) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-05 07:35:48 UTC (rev 614) @@ -45,12 +45,12 @@ echobase.common.areaOfOperation=AreaOfOperation echobase.common.author=Author echobase.common.authorEmail=Author email -echobase.common.biometrySampleFile=BiometrySample file -echobase.common.cellMapsFile=Map cells file +echobase.common.biometrySampleFile= +echobase.common.cellMapsFile= echobase.common.cellPositionReference=cellPositionReference -echobase.common.cellRegionAssociationFile=Region cells association file -echobase.common.cellRegionResultFile=Region cells results file -echobase.common.cellRegionsFile=Region cells file +echobase.common.cellRegionAssociationFile= +echobase.common.cellRegionResultFile= +echobase.common.cellRegionsFile= echobase.common.dataCentre=Data center echobase.common.dataCentreEmail=Data center email echobase.common.dataProcessing=DataProcessing @@ -58,25 +58,25 @@ echobase.common.datum=Datum echobase.common.digitThreshold=Digitization threshold echobase.common.distributionStatement=Distribution statement -echobase.common.echotypeFile=Echotypes file +echobase.common.echotypeFile= echobase.common.email=E-mail echobase.common.entityId=ID echobase.common.entityType=Entity type -echobase.common.esduByEchotypeAndSpeciesCategoryFile=Results per ESDU / echotype / species category file -echobase.common.esduByEchotypeFile=Results per ESDU / echotype file -echobase.common.esduBySpeciesAndAgeCategoryFile=Results per ESDU / species / age file -echobase.common.esduBySpeciesAndSizeCategoryFile=Results per ESDU / species / size file -echobase.common.gearMetadataFile=Gear metadata file +echobase.common.esduByEchotypeAndSpeciesCategoryFile= +echobase.common.esduByEchotypeFile= +echobase.common.esduBySpeciesAndAgeCategoryFile= +echobase.common.esduBySpeciesAndSizeCategoryFile= +echobase.common.gearMetadataFile= echobase.common.id=ID echobase.common.importDataMode=Import type -echobase.common.importDbFile=Import file (.zip) +echobase.common.importDbFile= echobase.common.importError=Error\: echobase.common.importMode=Import type -echobase.common.importMode.acoustic=Acoustic data import -echobase.common.importMode.catches=Fishing data import -echobase.common.importMode.common=Voyage / Transit / Transect data import -echobase.common.importMode.operation=Operations data import -echobase.common.importMode.results=Results import +echobase.common.importMode.acoustic= +echobase.common.importMode.catches= +echobase.common.importMode.common= +echobase.common.importMode.operation= +echobase.common.importMode.results= echobase.common.importNotes=Import notes echobase.common.importResult=Import results echobase.common.inProgress=Processing... @@ -88,8 +88,8 @@ echobase.common.keywords=Keywords echobase.common.lastModifiedDate=Last modified date echobase.common.lastModifiedUser=Last modified user -echobase.common.lengthAgeKeyFile=Size-age equations file -echobase.common.lengthWeightKeyFile=Size-weight equations file +echobase.common.lengthAgeKeyFile= +echobase.common.lengthWeightKeyFile= echobase.common.litteratureReferences=References echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat @@ -98,10 +98,10 @@ echobase.common.modificationDate=Last modified date echobase.common.modificationText=Last modification echobase.common.modificationUser=User -echobase.common.moviesFile=Acoustic data file +echobase.common.moviesFile= echobase.common.name=Name -echobase.common.operationFile=Operation data file -echobase.common.operationMetadataFile=Operation metadata file +echobase.common.operationFile= +echobase.common.operationMetadataFile= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Organisation contact echobase.common.password=Password @@ -118,20 +118,20 @@ echobase.common.soundSpeedCalculationsME70=Sound speed calculation method (ME70 instrument) echobase.common.sounderConstant=Sounder constant (if relevant) echobase.common.source=Source -echobase.common.subSampleFile=SubSample file -echobase.common.totalSampleFile=TotalSample file +echobase.common.subSampleFile= +echobase.common.totalSampleFile= echobase.common.transceiverAcquisitionAbsorptionDescription=Transceiver absorption coefficient computation method (data acquisition) echobase.common.transectBinUnitsPingAxis=Bin units along the ping axis (transect) -echobase.common.transectFile=Transect data file +echobase.common.transectFile= echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) echobase.common.transectLicence=Data license (transect) -echobase.common.transitFile=Transit data file +echobase.common.transitFile= echobase.common.transitRelatedActivity=Transit related activities echobase.common.user=User echobase.common.vessel=Vessel echobase.common.voyage=Cruise echobase.common.voyageDescription=Description -echobase.common.voyageFile=Voyage data file +echobase.common.voyageFile= echobase.confirm.delete.query=Delete query echobase.confirm.delete.workingDbConfiguration=Delete working database configuration echobase.error.bad.password=Invalid password 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-09-04 20:55:46 UTC (rev 613) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-05 07:35:48 UTC (rev 614) @@ -45,12 +45,12 @@ echobase.common.areaOfOperation=Zone d'activités echobase.common.author=Auteur echobase.common.authorEmail=Courriel de l'auteur -echobase.common.biometrySampleFile=Fichier de biométries (BiometrySample) -echobase.common.cellMapsFile=Fichier des cellules Cartes +echobase.common.biometrySampleFile= +echobase.common.cellMapsFile= echobase.common.cellPositionReference=Référentiel géographique des cellules des cartes -echobase.common.cellRegionAssociationFile=Fichier d'associations des cellules Région -echobase.common.cellRegionResultFile=Fichier de résultats de cellules Région -echobase.common.cellRegionsFile=Fichier des cellules Région +echobase.common.cellRegionAssociationFile= +echobase.common.cellRegionResultFile= +echobase.common.cellRegionsFile= echobase.common.dataCentre=Centre de données echobase.common.dataCentreEmail=Courriel du centre de données echobase.common.dataProcessing=DataProcessing @@ -58,25 +58,25 @@ echobase.common.datum=Référenciel echobase.common.digitThreshold=Seuil de numérisation echobase.common.distributionStatement=Conditions de diffusion des données -echobase.common.echotypeFile=Fichier des échotypes +echobase.common.echotypeFile= echobase.common.email=Courriel echobase.common.entityId=Identifiant de l'entité echobase.common.entityType=Type d'entité -echobase.common.esduByEchotypeAndSpeciesCategoryFile=Fichier de résultats par ESDU / échotype / catégorie d'espèce -echobase.common.esduByEchotypeFile=Fichier de résultats par ESDU / échotype -echobase.common.esduBySpeciesAndAgeCategoryFile=Fichier de résultats par ESDU / espèce / âge -echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier de résultats par ESDU / espèce / taille -echobase.common.gearMetadataFile=Fichier de méta-données d'engin +echobase.common.esduByEchotypeAndSpeciesCategoryFile= +echobase.common.esduByEchotypeFile= +echobase.common.esduBySpeciesAndAgeCategoryFile= +echobase.common.esduBySpeciesAndSizeCategoryFile= +echobase.common.gearMetadataFile= echobase.common.id=Identifiant echobase.common.importDataMode=Type d'import -echobase.common.importDbFile=Fichier d'import (zip) +echobase.common.importDbFile= echobase.common.importError=Une erreur est survenue pendant l'import \: echobase.common.importMode=Type d'import -echobase.common.importMode.acoustic=Import des données acoustiques -echobase.common.importMode.catches=Import des données de pêche -echobase.common.importMode.common=Import des données de Voyage / Transit / Transect -echobase.common.importMode.operation=Import des opérations -echobase.common.importMode.results=Import des résultats +echobase.common.importMode.acoustic= +echobase.common.importMode.catches= +echobase.common.importMode.common= +echobase.common.importMode.operation= +echobase.common.importMode.results= echobase.common.importNotes=Remarques sur l'import echobase.common.importResult=Résultat de l'import echobase.common.inProgress=En cours... @@ -88,8 +88,8 @@ echobase.common.keywords=Mots clefs echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification -echobase.common.lengthAgeKeyFile=Fichier des relations taille-âge -echobase.common.lengthWeightKeyFile=Fichier des relations taille-poids +echobase.common.lengthAgeKeyFile= +echobase.common.lengthWeightKeyFile= echobase.common.litteratureReferences=Références echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat @@ -98,10 +98,10 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur -echobase.common.moviesFile=Fichier des données acoustiques +echobase.common.moviesFile= echobase.common.name=Nom -echobase.common.operationFile=Fichier des données opérations -echobase.common.operationMetadataFile=Fichier des méta-données d'opérations +echobase.common.operationFile= +echobase.common.operationMetadataFile= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Références de l'organisation echobase.common.password=Mot de passe @@ -118,20 +118,20 @@ echobase.common.soundSpeedCalculationsME70=Méthode de calcul de la célérité du son (ME70) echobase.common.sounderConstant=Constante sondeur (si besoin) echobase.common.source=Source -echobase.common.subSampleFile=Fichier d'import des sous-échantillons (“SubSample”) -echobase.common.totalSampleFile=Fichier d'import des échantillons totaux (“TotalSample”) +echobase.common.subSampleFile= +echobase.common.totalSampleFile= echobase.common.transceiverAcquisitionAbsorptionDescription=Méthode de calcul du coefficient d'absorption pour l'acquisition des données echobase.common.transectBinUnitsPingAxis=Unité de la dimension horizontale des ESDU -echobase.common.transectFile=Fichier des données de transects +echobase.common.transectFile= echobase.common.transectGeospatialVerticalPositive=Direction de l'axe vertical des profondeurs (transect) echobase.common.transectLicence=Licence pour la diffusion des données (transect) -echobase.common.transitFile=Fichier des données de transits +echobase.common.transitFile= echobase.common.transitRelatedActivity=Travaux réalisés pendant le transit echobase.common.user=Utilisateur echobase.common.vessel=Navire echobase.common.voyage=Campagne echobase.common.voyageDescription=Description -echobase.common.voyageFile=Fichier des données de voyages +echobase.common.voyageFile= echobase.confirm.delete.query=Confirmer la suppression de la requête echobase.confirm.delete.workingDbConfiguration=Confirmer la suppression de la configuration suivante echobase.error.bad.password=Mot de passe incorrect

1 0