- T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3][develop] Création de base en ligne de commande (closes #293)
by Tony CHEMIT 13 Mar '18

13 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: be9495ed by Tony CHEMIT at 2018-03-13T13:39:04Z Création de base en ligne de commande (closes #293) - - - - - 30 changed files: - src/site/markdown/installer.md.vm - t3-domain/src/main/config/T3.ini - t3-domain/src/main/java/fr/ird/t3/T3Config.java - + t3-domain/src/main/java/fr/ird/t3/console/T3DatabaseTool.java - t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties - t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties - t3-installer/pom.xml - t3-installer/src/license/THIRD-PARTY.properties - t3-installer/src/main/assembly/bin.xml - + t3-installer/src/main/assembly/dist/README.md - + t3-installer/src/main/assembly/dist/create-db.bat - + t3-installer/src/main/assembly/dist/create-db.sh - t3-installer/src/main/assembly/dist/db.properties - − t3-installer/src/main/assembly/dist/debug.sh - + t3-installer/src/main/assembly/dist/fill-db.bat - + t3-installer/src/main/assembly/dist/fill-db.sh - − t3-installer/src/main/assembly/dist/install.bat - − t3-installer/src/main/assembly/dist/install.sh - + t3-installer/src/main/config/T3Installer.ini - t3-installer/src/test/java/fr/ird/t3/tools/db/reference/LengthWeightConversionImporterIT.java → t3-installer/src/main/java/fr/ird/t3/console/T3Console.java - − t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/reference/AbstractReferenceImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/reference/LengthWeightConversionImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/reference/RF1SpecieForFleetImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/reference/SetDurationImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/reference/SpeciesExtraDataImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/reference/SpeciesLengthStepImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/zone/AbstractZoneImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/zone/ZoneCWPImporter.java - − t3-installer/src/main/java/fr/ird/t3/tools/db/zone/ZoneEEImporter.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/be9495ed1b348b89a9e01b1e8b10032b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/be9495ed1b348b89a9e01b1e8b10032b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [IMPORT] Sélectionner le driver AVDTH 3.5 par défaut (Closes #291)
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 1eb6d9d2 by Tony CHEMIT at 2018-03-12T23:54:12Z [IMPORT] Sélectionner le driver AVDTH 3.5 par défaut (Closes #291) - - - - - 4 changed files: - t3-domain/src/main/config/T3.ini - t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties - t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties - t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java Changes: ===================================== t3-domain/src/main/config/T3.ini ===================================== --- a/t3-domain/src/main/config/T3.ini +++ b/t3-domain/src/main/config/T3.ini @@ -56,6 +56,12 @@ defaultValue = ${data.directory}/treatments transient = true final = true +[option defaultInputPilotId] +description = t3.config.defaultInputPilotId.description +key = defaultInputPilotId +type = String +defaultValue = AVDTH__3.5 + [option stratumWeightRatio] description = t3.config.stratum.weightRatio.description key = stratum.weightRatio ===================================== t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties ===================================== --- a/t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties +++ b/t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties @@ -147,6 +147,7 @@ t3.common.zoneVersion=Version of zone t3.config.context.path.description=Context path t3.config.data.directory.description=Data directory of T3+ t3.config.data.version.description=Data version +t3.config.defaultInputPilotId.description=Default AVDTH Input pilot name to use t3.config.internal.db.directory.description=Path of T3+ internal database t3.config.level0.weightedSetWeight.description=Weighted set weight (used to split mixed sets) t3.config.level2.defaultSpecies.description=Codes of selected species by default for level 2 ===================================== t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties ===================================== --- a/t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties +++ b/t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties @@ -147,6 +147,7 @@ t3.common.zoneVersion=Version de zone t3.config.context.path.description=Contexte applicatif t3.config.data.directory.description=Répertoire par défaut où mettre toutes les données de t3 (logs, fichier de configuration de db, ...) t3.config.data.version.description=Version des données +t3.config.defaultInputPilotId.description=Nom du pilote AVDTH à utiliser par défaut t3.config.internal.db.directory.description=Chemin de la base interne de T3+ t3.config.level0.weightedSetWeight.description=Poids moyen d'une calée t3.config.level2.defaultSpecies.description=Code des espèces sélectionnées par défaut pour le niveau 2 ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java @@ -135,6 +135,9 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn } else { log.info(String.format("Use existing treatment directory %s", getTreatmentDirectoryPath())); } + if (getConfiguration().getInputProvider() == null) { + inputProviderId = getApplicationConfig().getDefaultInputPilotId(); + } } public String doAddSource() throws Exception { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/1eb6d9d2b4de50b940bbe1e29af88d8c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/1eb6d9d2b4de50b940bbe1e29af88d8c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3 :: Pom
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: 72a97755 by 166231 at 2018-03-12T12:53:47Z Site checkin for project T3 :: Pom - - - - - 9 changed files: - + .gitlab-ci.yml - + aggregate-third-party-report.html - + changelog.html - + changes-report.html - + config-report.html - + css/apache-maven-fluido-1.6.min.css - + css/print.css - + css/site.css - + dependency-convergence.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/72a97755a075aab8a589b8f415c5ce37… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/72a97755a075aab8a589b8f415c5ce37… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3 :: Pom
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: 6e599f9c by Tony CHEMIT at 2018-03-12T12:37:01Z Site checkin for project T3 :: Pom - - - - - 9 changed files: - − .gitlab-ci.yml - − aggregate-third-party-report.html - − changelog.html - − changes-report.html - − config-report.html - − css/apache-maven-fluido-1.6.min.css - − css/print.css - − css/site.css - − dependency-convergence.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/6e599f9cb6ee41c7b381820a53c069ca… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/6e599f9cb6ee41c7b381820a53c069ca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] review site
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 061f297d by Tony CHEMIT at 2018-03-12T12:29:45Z review site - - - - - 3 changed files: - src/site/markdown/installer.md.vm - − src/site/resources/img/logo_IntelliJIDEA.png - src/site/site.xml Changes: ===================================== src/site/markdown/installer.md.vm ===================================== --- a/src/site/markdown/installer.md.vm +++ b/src/site/markdown/installer.md.vm @@ -28,8 +28,6 @@ Après téléchargement, on dézippe l'archive et on obtient l'arborescence suiv ├── install.bat (1) ├── install.sh (1) ├── db.properties (2) - ├── lib - │ └── ... ├── scripts │ ├── postgis-data (5) │ │ ├── zones-cwp-1x1.sql.zip @@ -40,6 +38,7 @@ Après téléchargement, on dézippe l'archive et on obtient l'arborescence suiv │ │ └── zones-fao-2011.sql.zip │ ├── postgis-structure.sql (3) │ └── referentiel-data.sql (4) + ├── t3-installer-${project.version}.exe └── t3-installer-${project.version}.jar ``` ===================================== src/site/resources/img/logo_IntelliJIDEA.png deleted ===================================== Binary files a/src/site/resources/img/logo_IntelliJIDEA.png and /dev/null differ ===================================== src/site/site.xml ===================================== --- a/src/site/site.xml +++ b/src/site/site.xml @@ -58,7 +58,6 @@ <logo href="http://struts.apache.org/" name="Struts 2" img="./img/struts2-logo.png"/> <logo href="http://topia.nuiton.org" name="ToPIA" img="./img/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" img="./img/argouml-logo.png"/> - <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/> </poweredBy> <body> @@ -75,12 +74,9 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Historique des versions" href="changes-report.html"/> - </menu> - - <menu name="Installation"> <item name="Installation" href="install.html"/> - <item name="Utilisation installer" href="installer.html"/> - <item name="Configuration" href="./application-config-report.html"/> + <item name="Création de base" href="installer.html"/> + <item name="Configuration" href="./config-report.html"/> </menu> <menu name="Modélisation"> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/061f297d5e048df127a8a9d427c3d9a3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/061f297d5e048df127a8a9d427c3d9a3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use last pom
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ccd71e9d by Tony CHEMIT at 2018-03-12T12:18:34Z use last pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.23</version> + <version>2018.24</version> </parent> <groupId>fr.ird.t3</groupId> @@ -148,12 +148,6 @@ <dependencies> <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>3.3.1.Final</version> - </dependency> - - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ccd71e9dad3bcfcb43a7bcc0e81f8b83… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ccd71e9dad3bcfcb43a7bcc0e81f8b83… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3 :: Pom
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: de143b6e by 166231 at 2018-03-12T11:31:11Z Site checkin for project T3 :: Pom - - - - - 4 changed files: - aggregate-third-party-report.html - changelog.html - changes-report.html - config-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/de143b6ea86ea116c16a80c286ea6ac8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/de143b6ea86ea116c16a80c286ea6ac8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Let's go to version 3.0 \o/ ^^
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 482f924b by Tony CHEMIT at 2018-03-12T11:28:41Z Let's go to version 3.0 \o/ ^^ - - - - - 11 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>T3 :: Pom</name> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.4-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/482f924bac9fa482a3cb4950d6eb9aef… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/482f924bac9fa482a3cb4950d6eb9aef… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Update changelog after release 2.3 [skip ci]
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: a83d14f7 by Tony CHEMIT at 2018-03-12T11:27:52Z Update changelog after release 2.3 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,24 @@ # T3 changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2018-03-02 14:50. + * Last generated at 2018-03-12 11:24. + +## Version [2.3](https://gitlab.com/ultreiaio/ird-t3/milestones/33) + +**Closed at 2018-03-12.** + +### Download +* [Installer (t3-2.3.zip)](https://oss.sonatype.org/content/repositories/frirdt3-1012/fr/…) +* [Application (t3-2.3.war)](https://oss.sonatype.org/content/repositories/frirdt3-1012/fr/…) + +### Issues + * [[Evolution 116]](https://gitlab.com/ultreiaio/ird-t3/issues/116) **Marées sans logbooks : gestion de leurs échantillons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 261]](https://gitlab.com/ultreiaio/ird-t3/issues/261) **[N2][N3] Les calées de type banc indéterminé ne sont pas traitées au N2 et N3** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 269]](https://gitlab.com/ultreiaio/ird-t3/issues/269) **[N2][N3] Stockage des niveaux de substitution atteints** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 276]](https://gitlab.com/ultreiaio/ird-t3/issues/276) **Règles d'acceptation des marées dans les traitements** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 287]](https://gitlab.com/ultreiaio/ird-t3/issues/287) **[N0.3] Conversion des catégories logbook - rendre générique la codification des catégories inconnues** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 288]](https://gitlab.com/ultreiaio/ird-t3/issues/288) **Spatialiser la table Ocean** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 290]](https://gitlab.com/ultreiaio/ird-t3/issues/290) **Spatialisation de la table Harbour** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [2.2](https://gitlab.com/ultreiaio/ird-t3/milestones/32) Replace user database by a simple **yaml** file. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a83d14f740b31129fc040fbb8ba24048… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a83d14f740b31129fc040fbb8ba24048… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Deleted branch release/2.3
by Tony CHEMIT 12 Mar '18

12 Mar '18

Tony CHEMIT deleted branch release/2.3 at ultreiaio / ird-t3 --- You're receiving this email because of your account on gitlab.com.

1 0