May 2015 - Observe-commits - mailman.cloud.codelutin.com

branch develop updated (d2c85b4 -> 647b966)
by codelutin.com scm May 22, 2015

May 22, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from d2c85b4 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop new a5b99ae ajout de migration des ids défaillants (refs #7142) new 49f7fc8 fixes #7142: Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine Merge branch 'feature/7142' into develop new ab4e457 permettre d'utiliser des valeurs de variables non String (refs #7137) new 8890409 ajout du rapport (refs #7137) new 647b966 fixes #7137: [PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées Merge branch 'feature/7137' into develop The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 647b96672e65e4c5dae81a71e17b23378804088f Merge: 49f7fc8 8890409 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 20:23:30 2015 +0200 fixes #7137: [PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées Merge branch 'feature/7137' into develop commit 8890409a7d230f9fdfef8ed6a13f280cdf501137 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 20:23:25 2015 +0200 ajout du rapport (refs #7137) commit ab4e4575476e3606b81306bf6ddae5afe4bd1394 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 20:23:05 2015 +0200 permettre d'utiliser des valeurs de variables non String (refs #7137) commit 49f7fc8f28ed2d96e18de6b8e5057a550e50faa4 Merge: d2c85b4 a5b99ae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 20:21:35 2015 +0200 fixes #7142: Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine Merge branch 'feature/7142' into develop commit a5b99ae55bf3195cc4f632285b5212602f774537 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 20:21:24 2015 +0200 ajout de migration des ids défaillants (refs #7142) Summary of changes: .../src/main/filters/observe-reports.properties | 41 ++++++++++++++++++++++ .../fr/ird/observe/report/model/ReportExecute.java | 12 +++---- .../ird/observe/report/model/ReportOperation.java | 2 +- .../fr/ird/observe/report/model/ReportRequest.java | 10 +++--- .../report/model/operations/ExecuteRequests.java | 2 +- .../migration/AbstractDataSourceMigration.java | 4 ++- ... => DataSourceMigrationForVersion_4_0_RC6.java} | 40 +++++---------------- .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 5 +++ .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 5 +++ .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 3 +- 12 files changed, 79 insertions(+), 49 deletions(-) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_3_12.java => DataSourceMigrationForVersion_4_0_RC6.java} (51%) create mode 100644 observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql create mode 100644 observe-entities/src/main/resources/db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 5

branch develop updated (feb42a7 -> d2c85b4)
by codelutin.com scm May 22, 2015

May 22, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from feb42a7 utilisation de requetes spécifique pour les mises à jour plutôt que de charger la base via hibernate (refs #7135) new e6a87c6 la dernière version de topia ajoute des binders simples pour toutes les entités (refs #7141) new 995076f fixes #7141: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée Merge branch 'feature/7141' into develop new f899b96 on se base uniquement sur les topiaId des trip pour l'export des marées vers une base distante (refs #7041) new d2c85b4 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d2c85b4511ed400239e6841f90279a01476e2536 Merge: 995076f f899b96 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 16:44:56 2015 +0200 fixes #7041: La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid Merge branch 'feature/7041' into develop commit f899b96f14dcc3452417997278c9fec9db048b05 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 16:44:54 2015 +0200 on se base uniquement sur les topiaId des trip pour l'export des marées vers une base distante (refs #7041) commit 995076ff66167d6b747c857ddd1d976b61bf08dd Merge: feb42a7 e6a87c6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 16:24:56 2015 +0200 fixes #7141: Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée Merge branch 'feature/7141' into develop commit e6a87c6d5b56e4d459fc2628dada4906b695ec47 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 16:24:54 2015 +0200 la dernière version de topia ajoute des binders simples pour toutes les entités (refs #7141) Summary of changes: .../fr/ird/observe/ObserveApplicationContext.java | 12 +----- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 48 +++++----------------- .../ird/observe/ui/admin/export/ExportModel.java | 4 +- pom.xml | 2 +- 4 files changed, 13 insertions(+), 53 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 4

branch develop updated (d80bebc -> feb42a7)
by codelutin.com scm May 22, 2015

May 22, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from d80bebc fixes #7074: Problème de lancement de calcul avec la jdk 8 Merge branch 'feature/7074' into develop new feb42a7 utilisation de requetes spécifique pour les mises à jour plutôt que de charger la base via hibernate (refs #7135) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit feb42a72b89dd9044b03fea5e8c425c16e4b8ac5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 22 13:13:06 2015 +0200 utilisation de requetes spécifique pour les mises à jour plutôt que de charger la base via hibernate (refs #7135) Summary of changes: .../src/main/java/fr/ird/observe/DataService.java | 55 +++++++++++++ .../main/java/fr/ird/observe/entities/Trip.java | 4 - .../entities/longline/TripLonglineDAOImpl.java | 89 +++++++++++++++++++++ .../entities/longline/TripLonglineImpl.java | 85 ++++++++++---------- .../ird/observe/entities/seine/RouteDAOImpl.java | 47 +++++++++++ .../fr/ird/observe/entities/seine/RouteImpl.java | 33 +------- .../observe/entities/seine/TripSeineDAOImpl.java | 90 ++++++++++++++++++++++ .../ird/observe/entities/seine/TripSeineImpl.java | 74 ++++++++++-------- .../impl/longline/ActivityLonglineUIHandler.java | 72 ++++++++++++++++- .../open/impl/longline/TripLonglineUIHandler.java | 5 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 64 ++++++++------- .../open/impl/seine/TripSeineUIHandler.java | 5 +- 12 files changed, 477 insertions(+), 146 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7133 updated (d352e5a -> 2c463e0)
by codelutin.com scm May 22, 2015

May 22, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7133 in repository observe. See http://git.codelutin.com/observe.git from d352e5a refs #7132 : ajout des point "Rencontre" et "station océanographique" et modification du style de la carte new 2c463e0 refs #7132 #7133 : utilisation des id plutot que les code pour les types activité. pour les palangre ne gardé q'un type "au port" (départ et arrivé) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2c463e0a22f2b5394c348bd52dfdb2380490bf92 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri May 22 12:18:49 2015 +0200 refs #7132 #7133 : utilisation des id plutot que les code pour les types activité. pour les palangre ne gardé q'un type "au port" (départ et arrivé) Summary of changes: .../entities/longline/TripLonglineDAOImpl.java | 20 +++++++++----------- .../ird/observe/entities/seine/TripSeineDAOImpl.java | 8 +++----- .../fr/ird/observe/tripMap/TripMapPointType.java | 3 +-- .../resources/i18n/observe-entities_en_GB.properties | 1 + .../resources/i18n/observe-entities_es_ES.properties | 1 + .../resources/i18n/observe-entities_fr_FR.properties | 3 +-- .../ui/util/tripMap/TripMapContentBuilder.java | 4 ++-- .../observe/ui/util/tripMap/TripMapUIHandler.java | 7 ++++++- observe-swing/src/main/map/style.xml | 14 +------------- 9 files changed, 25 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7133 updated (87f104b -> d352e5a)
by codelutin.com scm May 21, 2015

May 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7133 in repository observe. See http://git.codelutin.com/observe.git from 87f104b refs #7133 : ajout des point "Au port" et style de la carte new d352e5a refs #7132 : ajout des point "Rencontre" et "station océanographique" et modification du style de la carte The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d352e5aa390b0093951fd07386a20d627d6bc96b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu May 21 17:49:27 2015 +0200 refs #7132 : ajout des point "Rencontre" et "station océanographique" et modification du style de la carte Summary of changes: .../entities/longline/TripLonglineDAOImpl.java | 53 ++- .../observe/entities/seine/TripSeineDAOImpl.java | 15 +- .../fr/ird/observe/tripMap/TripMapPointType.java | 8 +- .../i18n/observe-entities_en_GB.properties | 2 + .../i18n/observe-entities_es_ES.properties | 2 + .../i18n/observe-entities_fr_FR.properties | 2 + .../ui/util/tripMap/TripMapContentBuilder.java | 435 +++++++++++++++++++++ .../observe/ui/util/tripMap/TripMapUIHandler.java | 351 ++--------------- observe-swing/src/main/map/style.xml | 153 +++++++- .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 2 + 12 files changed, 667 insertions(+), 360 deletions(-) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (e901afc -> d80bebc)
by codelutin.com scm May 21, 2015

May 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from e901afc use codelutinpom 2.0 new da7d9ca on force a typer en float le résultat (fonctionne sous jdk 7 et 8) (refs #7074) new d80bebc fixes #7074: Problème de lancement de calcul avec la jdk 8 Merge branch 'feature/7074' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d80bebc13704473d83af361cc5e00be43106370e Merge: e901afc da7d9ca Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 21 10:50:19 2015 +0200 fixes #7074: Problème de lancement de calcul avec la jdk 8 Merge branch 'feature/7074' into develop commit da7d9ca8ce60e60825cf71db86801659ca22960d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 21 10:50:14 2015 +0200 on force a typer en float le résultat (fonctionne sous jdk 7 et 8) (refs #7074) Summary of changes: .../referentiel/LengthWeightParemeterHelper.java | 19 +++++++------------ .../src/test/java/fr/ird/observe/ScriptTest.java | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch develop updated (a944bc0 -> e901afc)
by codelutin.com scm May 21, 2015

May 21, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from a944bc0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new e901afc use codelutinpom 2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e901afc30c170853fb69e2924075ca4c0b2ebaf9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu May 21 10:17:05 2015 +0200 use codelutinpom 2.0 Summary of changes: README.txt | 8 +++++++- pom.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7133 created (now 87f104b)
by codelutin.com scm May 20, 2015

May 20, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7133 in repository observe. See http://git.codelutin.com/observe.git at 87f104b refs #7133 : ajout des point "Au port" et style de la carte This branch includes the following new commits: new 87f104b refs #7133 : ajout des point "Au port" et style de la carte The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 87f104b18492e0a72109532126c956cda2b4309e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed May 20 17:11:40 2015 +0200 refs #7133 : ajout des point "Au port" et style de la carte -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch release/4.0-RC5 deleted (was 4bb0f4b)
by codelutin.com scm May 11, 2015

May 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC5 in repository observe. See http://git.codelutin.com/observe.git was 4bb0f4b [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC5' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

annotated tag observe-4.0-RC5 created (now aa98680)
by codelutin.com scm May 11, 2015

May 11, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag observe-4.0-RC5 in repository observe. See http://git.codelutin.com/observe.git at aa98680 (tag) tagging 0b35bd6e8c419a8feb1cbbc91127ba5ba82c426f (commit) replaces observe-4.0-RC4 tagged by Maven Release on Mon May 11 12:50:30 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC5 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0