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

branch develop updated (9c6f2fd -> 2ccfb51)
by codelutin.com scm April 11, 2015

April 11, 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 discards 9c6f2fd [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/develop (2ccfb51) \ O -- O -- O (9c6f2fd) Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

[ANN] - ObServe 4.0-RC2 released
by codelutin.com Release Notification April 11, 2015

April 11, 2015

The ObServe team is pleased to announce the observe-4.0-RC2 release! Projet ObServe Documentation of the project can be found here: https://observe.codelutin.com Changes ------- Changes in this version include: New features: o Inclure ce fichier observe-report.properties dans la 4.0 RC2 Issue: 6913. Thanks to Pascal CAUQUIL. Resolved by tchemit. o Amélioration des temps d'ouverture de l'arbre de navigation Issue: 6914. Thanks to Tony Chemit. Resolved by tchemit. o Amélioration du script apply-extra.sh Issue: 6923. Thanks to Tony Chemit. Resolved by tchemit. o [ObServeLL] Revue de la fonctionnalité d'export de marée Issue: 6938. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Mauvais libéllé lors de la création d'une base distante Issue: 6921. Thanks to Tony Chemit. Resolved by tchemit. o Problème de création d'une nouvelle base (suppression schéma public) Issue: 6920. Thanks to Tony Chemit. Resolved by tchemit. o Problème de création d'une nouvelle base (table tms_version non créée) Issue: 6922. Thanks to Tony Chemit. Resolved by tchemit. o Problème de création de base distante (avec recopie de données) Issue: 6919. Thanks to Tony Chemit. Resolved by tchemit. o Problème sur la type de Program.geartype Issue: 6934. Thanks to Tony Chemit. Resolved by tchemit. o bug à l'exportation données vers base centrale Issue: 6933. Thanks to Philippe Sabarros. Resolved by pcauquil. o Problème lors de la synchronisation des référentiels Issue: 6937. Thanks to Tony Chemit. Resolved by tchemit. o Une case à cocher est toujours présente mais sans libellé dans les actions Issue: 6939. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/observe/files * observe-4.0-RC2.zip - http://forge.codelutin.com/attachments/download/3083 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -ObServe team

1 0

branch release/4.0-RC2 created (now 2ccfb51)
by codelutin.com scm April 11, 2015

April 11, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC2 in repository observe. See http://git.codelutin.com/observe.git at 2ccfb51 fixes #6938: [ObServeLL] Revue de la fonctionnalité d'export de marée Merge branch 'feature/6938' into develop 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

branch develop updated (2ccfb51 -> 9c6f2fd)
by codelutin.com scm April 11, 2015

April 11, 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 2ccfb51 fixes #6938: [ObServeLL] Revue de la fonctionnalité d'export de marée Merge branch 'feature/6938' into develop new 9c6f2fd [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development 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 9c6f2fd6ecb594b42c48be01c8947cbee012e4f4 Author: Maven Release <maven-release(a)codelutin.com> Date: Sat Apr 11 08:14:06 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 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 develop updated (39432f2 -> 2ccfb51)
by codelutin.com scm April 11, 2015

April 11, 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 39432f2 fixes #6937: Problème lors de la synchronisation des référentiels Merge branch 'feature/6937' into develop new 39b6abd refs #6939 suppression de la case à cocher qui correspondait à l'import access new 677db7b fixes #6939: Une case à cocher est toujours présente mais sans libellé dans les actions Merge branch 'feature/6939' into develop new 4038961 refs #6938 on rattache le program a sa maree dans le modele de selection new f745d40 refs #6938 Suppression de méthodes sur les dao (on utilise le chargement via le modèle de sélection) + ajout de méthode pour supprimer une marée new e359dc6 refs #6938 Utilisation du modèel de sélection pour obtenir les marées existantes sur la base distante + nettoyage du code new 0b850cd refs #6938 simplification et amélioration du code d'export de marées new 2ccfb51 fixes #6938: [ObServeLL] Revue de la fonctionnalité d'export de marée Merge branch 'feature/6938' into develop The 7 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 2ccfb5195f6602980ef0f3f58a87be516fdec750 Merge: 677db7b 0b850cd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 09:30:51 2015 +0200 fixes #6938: [ObServeLL] Revue de la fonctionnalité d'export de marée Merge branch 'feature/6938' into develop commit 0b850cdbdeac51acb0b722dc3e4bebad2d16cc81 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 08:18:16 2015 +0200 refs #6938 simplification et amélioration du code d'export de marées commit e359dc6eedb4177a5504b4dc80855fcd5d772331 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 08:10:10 2015 +0200 refs #6938 Utilisation du modèel de sélection pour obtenir les marées existantes sur la base distante + nettoyage du code commit f745d403cea48073d0e7f6de635fc3311935ae98 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 08:07:54 2015 +0200 refs #6938 Suppression de méthodes sur les dao (on utilise le chargement via le modèle de sélection) + ajout de méthode pour supprimer une marée commit 40389619dcadce4f1701ad5e01ad84684d66711e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 08:06:59 2015 +0200 refs #6938 on rattache le program a sa maree dans le modele de selection commit 677db7b1c5f40a14a490abbcae497829ea363e31 Merge: 39432f2 39b6abd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 09:24:48 2015 +0200 fixes #6939: Une case à cocher est toujours présente mais sans libellé dans les actions Merge branch 'feature/6939' into develop commit 39b6abd00464899f6e0afeebadaf5ddc0e7e0ca7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 09:24:42 2015 +0200 refs #6939 suppression de la case à cocher qui correspondait à l'import access Summary of changes: .../src/main/java/fr/ird/observe/DataService.java | 44 ++++++ .../ird/observe/db/model/DataSelectionModel.java | 2 + .../entities/longline/TripLonglineDAOImpl.java | 38 +---- .../observe/entities/seine/TripSeineDAOImpl.java | 38 +---- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 123 ++++++---------- .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 6 - .../ird/observe/ui/admin/export/ExportModel.java | 76 +++++++--- .../observe/ui/admin/export/ExportUIHandler.java | 164 +++++---------------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 49 +----- .../ui/admin/export/TripToExportTableModel.java | 28 +--- .../resources/i18n/observe-swing_fr_FR.properties | 2 +- 11 files changed, 201 insertions(+), 369 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

branch develop updated (9022064 -> 39432f2)
by codelutin.com scm April 11, 2015

April 11, 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 9022064 ajout base pour tests de la dernière migration new e36da41 refs #6937 utilisation de topia 2.9.5.1 (corrige le problème des suppressions d'associations) new 0025d45 refs #6937 modification de la relation dans le modèle new 39432f2 fixes #6937: Problème lors de la synchronisation des référentiels Merge branch 'feature/6937' into develop The 3 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 39432f2ec135e0fda1ed6f69cf62f5744f3626db Merge: 9022064 0025d45 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 07:33:22 2015 +0200 fixes #6937: Problème lors de la synchronisation des référentiels Merge branch 'feature/6937' into develop commit 0025d455913dbfc6d2861dbb488464664cd6c5e1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 07:33:14 2015 +0200 refs #6937 modification de la relation dans le modèle commit e36da41c12aaf7aafac51e5cfcf1056449106fed Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 07:32:55 2015 +0200 refs #6937 utilisation de topia 2.9.5.1 (corrige le problème des suppressions d'associations) Summary of changes: .../src/main/xmi/observe-longline.zargo | Bin 93859 -> 93860 bytes pom.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

branch develop updated (7b0afb8 -> 9022064)
by codelutin.com scm April 10, 2015

April 10, 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 7b0afb8 fixes #6914: Amélioration des temps d'ouverture de l'arbre de navigation Merge branch 'feature/6914' into develop new 46a27f1 refs #6933 ajout de getOcean sur le contrat de Trip new b8f6625 refs #6933 Pouvoir récuperer tous les marées new 04196f9 refs #6933 Récuperation de toutes les marees + utilisation des deux type de marees new eeab0f2 fixes #6933: bug à l'exportation données vers base centrale Merge branch 'feature/6933' into develop new 9022064 ajout base pour tests de la dernière migration 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 9022064c2bde3b99d8623bd38623bdc890bde71f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 19:58:22 2015 +0200 ajout base pour tests de la dernière migration commit eeab0f2eb0a147558cb56461e15fecf88471b47d Merge: 7b0afb8 04196f9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 19:57:46 2015 +0200 fixes #6933: bug à l'exportation données vers base centrale Merge branch 'feature/6933' into develop commit 04196f98170996dc398adb36c84e7b3765ba0b43 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 19:57:36 2015 +0200 refs #6933 Récuperation de toutes les marees + utilisation des deux type de marees commit b8f66252645c8c78347bb0644e39bfb54be289c0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 19:56:25 2015 +0200 refs #6933 Pouvoir récuperer tous les marées commit 46a27f1aef027e07dd24dc86aa89f4a4c98263e7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 19:53:15 2015 +0200 refs #6933 ajout de getOcean sur le contrat de Trip Summary of changes: .../test/resources/db/4.0-RC2/referentiel.sql.gz | Bin 0 -> 138115 bytes .../main/java/fr/ird/observe/entities/Trip.java | 3 + .../entities/longline/TripLonglineDAOImpl.java | 32 ++++++++- .../observe/entities/seine/TripSeineDAOImpl.java | 32 ++++++++- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 34 ++++++--- .../ui/admin/consolidate/ConsolidateUIHandler.java | 26 ++++--- .../ird/observe/ui/admin/export/ExportModel.java | 28 ++++++-- .../observe/ui/admin/export/ExportUIHandler.java | 78 +++++++++++++-------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 36 ++++++---- .../ui/admin/export/TripToExportTableModel.java | 9 +-- 11 files changed, 205 insertions(+), 79 deletions(-) create mode 100644 observe-business/src/test/resources/db/4.0-RC2/referentiel.sql.gz -- 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 (4baf239 -> 7b0afb8)
by codelutin.com scm April 10, 2015

April 10, 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 4baf239 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 569c1fb fix site configuration new f2b1378 refs #6921: Mauvais libéllé lors de la création d'une base distante new dc617b2 refs #6919 (possibilité d'avoir la source en cours de création) new c24bd6b refs #6920: Ne pas supprimer le schméma public new 83cadbe refs #6922 topia 2.9.5 corrige le problème new e6c1bde refs #6923 Ajout de dbHost et dbPort dans le script new 9f25408 refs #6913 modification du fichier des rapports new d619408 refs #6914 ajouts de méthodes de récupération des entitiés pour la décoration de l'arbre et des listes new 1e65cb0 refs #6914 ajout d'un decorateur pour TripLongline et suppression de celui Trip new 6460fbd refs #6914 Ajout dans le modèle de sélection de l'arbre d'un cache d'entités utilisées pour le construire new 894d747 refs #6914 Ajout d'un cache d'entité chargée dans les noeuds de l'arbre de navigation + ne pas accéder à la datasource depuis le renderer new 08bde7b refs #6914 utilisation des listes simplfiées aussi dans les écrans de liste new 3c6245c refs #6914 suppression d'un chargeur de noeud par association (trop couteux) new 7e2a04d refs 6934 ajout d'une migration 4.0-RC2 new bd6b92f ne pas faire de migration lors des tests new 92410cf fix site configuration new a036248 refs #6921: Mauvais libéllé lors de la création d'une base distante new 9c79c44 fixes #6921: Mauvais libéllé lors de la création d'une base distante Merge branch 'feature/6921' into develop new 54c2925 refs #6919 (possibilité d'avoir la source en cours de création) new bc47e51 fixes #6919: Problème de création de base distante (avec recopie de données) Merge branch 'feature/6919' into develop new 5c79e02 refs #6920: Ne pas supprimer le schméma public new 900b718 fixes #6920: Problème de création d'une nouvelle base (suppression schéma public) Merge branch 'feature/6920' into develop new 57e9f55 refs #6922 topia 2.9.5 corrige le problème new bb72058 fixes #6922: Problème de création d'une nouvelle base (table tms_version non créée) Merge branch 'feature/6922' into develop new 8705801 refs #6923 Ajout de dbHost et dbPort dans le script new be1457d fixes #6923: Amélioration du script apply-extra.sh Merge branch 'feature/6923' into develop new f3c07de refs #6913 modification du fichier des rapports new 43448a9 fixes #6913: Inclure ce fichier observe-report.properties dans la 4.0 RC2 Merge branch 'feature/6913' into develop new e6018f0 refs #6914 ajouts de méthodes de récupération des entitiés pour la décoration de l'arbre et des listes new cbfc737 refs #6914 ajout d'un decorateur pour TripLongline et suppression de celui Trip new 93826a7 refs #6914 Ajout dans le modèle de sélection de l'arbre d'un cache d'entités utilisées pour le construire new 4289e1e refs #6914 Ajout d'un cache d'entité chargée dans les noeuds de l'arbre de navigation + ne pas accéder à la datasource depuis le renderer new 0fd01fa refs #6914 utilisation des listes simplfiées aussi dans les écrans de liste new 1be23f3 refs #6914 suppression d'un chargeur de noeud par association (trop couteux) new 7b0afb8 fixes #6914: Amélioration des temps d'ouverture de l'arbre de navigation Merge branch 'feature/6914' into develop The 35 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 7b0afb861c1199c9cce15e717f04d9168c6bcba4 Merge: bd6b92f 1be23f3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 17:05:20 2015 +0200 fixes #6914: Amélioration des temps d'ouverture de l'arbre de navigation Merge branch 'feature/6914' into develop commit bd6b92f34f0403d25082c55aa56884f05d5803ed Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 16:44:31 2015 +0200 ne pas faire de migration lors des tests commit 7e2a04dc1772ca8d049d1ed705d507f6704fa1d7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 10 16:43:27 2015 +0200 refs 6934 ajout d'une migration 4.0-RC2 commit 3c6245cce5faa894ac9c3b48d43b81578d3ddde7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:53:43 2015 +0200 refs #6914 suppression d'un chargeur de noeud par association (trop couteux) commit 08bde7b11fa03cded69be98eaffdf2bb2f8a557e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:49:23 2015 +0200 refs #6914 utilisation des listes simplfiées aussi dans les écrans de liste commit 894d74784d54164c7393bfa16d1c7a8cfc8a11fb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:35:51 2015 +0200 refs #6914 Ajout d'un cache d'entité chargée dans les noeuds de l'arbre de navigation + ne pas accéder à la datasource depuis le renderer commit 6460fbd4581445d92b74c197796154ad84234f21 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:34:25 2015 +0200 refs #6914 Ajout dans le modèle de sélection de l'arbre d'un cache d'entités utilisées pour le construire commit 1e65cb0af8b8a2af793759e6f257b5455e16540e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:33:25 2015 +0200 refs #6914 ajout d'un decorateur pour TripLongline et suppression de celui Trip commit d619408c8fa9eafa3c5dd5310b55e396fb42067b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:32:54 2015 +0200 refs #6914 ajouts de méthodes de récupération des entitiés pour la décoration de l'arbre et des listes commit 9f2540842305fa52a7c4ece06ccab8cb293584e5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 18:20:29 2015 +0200 refs #6913 modification du fichier des rapports commit e6c1bdeff653c9f5f98ac19f677c99c0dbc3c6ed Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:09:03 2015 +0200 refs #6923 Ajout de dbHost et dbPort dans le script commit 83cadbe8e83532e530b758a778f045d8ad6bdc6b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:05:23 2015 +0200 refs #6922 topia 2.9.5 corrige le problème commit c24bd6b5dd4eefba85caa3c4aabd22b9a822f06c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:36:25 2015 +0200 refs #6920: Ne pas supprimer le schméma public commit dc617b2234937a1143f90307608acb5bd178d868 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:24:31 2015 +0200 refs #6919 (possibilité d'avoir la source en cours de création) commit f2b13783904211153afd6ba1e5fdb22c54fce721 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:22:28 2015 +0200 refs #6921: Mauvais libéllé lors de la création d'une base distante commit 569c1fbe62793076283c67feb4d1cbc8c42d60ae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 12:36:00 2015 +0200 fix site configuration commit 1be23f39c789e650810040aa1953b11ce24b2d94 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:53:43 2015 +0200 refs #6914 suppression d'un chargeur de noeud par association (trop couteux) commit 0fd01fa99bf4cee298038659c695988873016e5f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:49:23 2015 +0200 refs #6914 utilisation des listes simplfiées aussi dans les écrans de liste commit 4289e1ee14ae368b65ef271a08e8bff2ce91d3db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:35:51 2015 +0200 refs #6914 Ajout d'un cache d'entité chargée dans les noeuds de l'arbre de navigation + ne pas accéder à la datasource depuis le renderer commit 93826a74b4e97a3d7ef137ee11bf3731582829d0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:34:25 2015 +0200 refs #6914 Ajout dans le modèle de sélection de l'arbre d'un cache d'entités utilisées pour le construire commit cbfc737df02e9b50c0969e2e7f92172c586e6728 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:33:25 2015 +0200 refs #6914 ajout d'un decorateur pour TripLongline et suppression de celui Trip commit e6018f0169184bf73f2b234398f3ca4b52cfaa47 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 08:32:54 2015 +0200 refs #6914 ajouts de méthodes de récupération des entitiés pour la décoration de l'arbre et des listes commit 43448a920451611e3a313eb877127f83c1c1ca1c Merge: be1457d f3c07de Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 18:20:36 2015 +0200 fixes #6913: Inclure ce fichier observe-report.properties dans la 4.0 RC2 Merge branch 'feature/6913' into develop commit f3c07de61cd8bfd320a42fc914c3702fe91883ff Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 18:20:29 2015 +0200 refs #6913 modification du fichier des rapports commit be1457d6fa1e5d567508b11905a2a8390ef19d03 Merge: bb72058 8705801 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:09:08 2015 +0200 fixes #6923: Amélioration du script apply-extra.sh Merge branch 'feature/6923' into develop commit 8705801f7368ed28b71aec3961c423a9928eb1b3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:09:03 2015 +0200 refs #6923 Ajout de dbHost et dbPort dans le script commit bb7205838d271c0a78002ebff67c4496b87b5310 Merge: 900b718 57e9f55 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:05:32 2015 +0200 fixes #6922: Problème de création d'une nouvelle base (table tms_version non créée) Merge branch 'feature/6922' into develop commit 57e9f55315a1eef08789bcfad4107fcaaa83ba84 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 12:05:23 2015 +0200 refs #6922 topia 2.9.5 corrige le problème commit 900b71842561f9e5f08deb4f2578dcb9613b7dae Merge: bc47e51 5c79e02 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:36:35 2015 +0200 fixes #6920: Problème de création d'une nouvelle base (suppression schéma public) Merge branch 'feature/6920' into develop commit 5c79e025955e73e30ae746360725f20d6feba59e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:36:25 2015 +0200 refs #6920: Ne pas supprimer le schméma public commit bc47e5137ffd11a93439991291f8a11907f9697e Merge: 9c79c44 54c2925 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:25:04 2015 +0200 fixes #6919: Problème de création de base distante (avec recopie de données) Merge branch 'feature/6919' into develop commit 54c2925b2805ddb2ca1823bf28d3bc4419d622b6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:24:31 2015 +0200 refs #6919 (possibilité d'avoir la source en cours de création) commit 9c79c4407aa9f7fb1eedb01bbd3fc12acb1624da Merge: 92410cf a036248 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:22:37 2015 +0200 fixes #6921: Mauvais libéllé lors de la création d'une base distante Merge branch 'feature/6921' into develop commit a036248f1ec327b7e12541f737824da847c703a1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 9 10:22:28 2015 +0200 refs #6921: Mauvais libéllé lors de la création d'une base distante commit 92410cfb6c8f57ca8f67ce59e95c65efa496f29a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 8 12:36:00 2015 +0200 fix site configuration Summary of changes: .../src/main/filters/observe-reports.properties | 20 +- .../src/main/java/fr/ird/observe/DataService.java | 397 ++++++++++++++++----- .../main/java/fr/ird/observe/DecoratorService.java | 6 +- .../java/fr/ird/observe/db/ReplicationService.java | 17 +- .../ird/observe/db/model/DataSelectionModel.java | 30 +- .../java/fr/ird/observe/db/util/PGInstall.java | 8 +- ...ipDecorator.java => TripLonglineDecorator.java} | 21 +- .../replication/H2LonglineReplicateDataTest.java | 2 +- .../ird/observe/entities/constants/GearType.java | 11 + .../entities/constants/ReferenceLocale.java | 34 ++ .../entities/longline/ActivityLonglineDAOImpl.java | 118 ++++++ .../entities/longline/TripLonglineDAOImpl.java | 133 ++++++- .../migration/AbstractDataSourceMigration.java | 3 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 89 +++++ .../entities/referentiel/ProgramDAOImpl.java | 101 ++++++ .../entities/referentiel/ReferenceEntities.java | 1 + .../entities/seine/ActivitySeineDAOImpl.java | 119 ++++++ .../entities/seine/FloatingObjectDAOImpl.java | 102 ++++++ .../ird/observe/entities/seine/RouteDAOImpl.java | 93 +++++ .../observe/entities/seine/TripSeineDAOImpl.java | 131 ++++++- .../db/4.0-RC2/clean-program-gear-type-H2.sql | 6 + .../db/4.0-RC2/clean-program-gear-type-PG.sql | 5 + .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- .../assembly/dist/obstuna-admin/apply-extra.sh | 14 +- .../ird/observe/ui/content/ContentUIHandler.java | 5 +- .../impl/longline/SetLonglineUIHandler.java | 3 +- .../impl/seine/FloatingObjectUIHandler.java | 3 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 3 +- .../impl/longline/ActivityLonglinesUIHandler.java | 16 +- .../list/impl/longline/TripLonglinesUIHandler.java | 10 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 16 +- .../content/list/impl/seine/RoutesUIHandler.java | 12 +- .../list/impl/seine/TripSeinesUIHandler.java | 10 +- .../ui/content/open/ContentOpenableUIHandler.java | 28 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.css | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 41 +-- .../ird/observe/ui/tree/ActivityLonglineNode.java | 28 ++ .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 28 ++ .../fr/ird/observe/ui/tree/EntityNodeSupport.java | 146 ++++++++ .../observe/ui/tree/FloatingObjectSeineNode.java | 28 ++ .../ird/observe/ui/tree/ObserveDataProvider.java | 11 + .../java/fr/ird/observe/ui/tree/ObserveNode.java | 66 +--- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 75 ++-- .../ird/observe/ui/tree/ProgramLonglineNode.java | 29 ++ .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 28 ++ .../fr/ird/observe/ui/tree/RouteSeineNode.java | 27 ++ .../fr/ird/observe/ui/tree/SetLonglineNode.java | 28 ++ .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 28 ++ .../fr/ird/observe/ui/tree/TripLonglineNode.java | 27 ++ .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 27 ++ .../actions/ChangeTripProgramActionListener.java | 6 +- .../AbstractAssociationNodeChildLoador.java | 68 ---- .../loadors/ActivityLonglineNodeChildLoador.java | 22 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 26 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 49 +-- .../loadors/ActivitySeinesNodeChildLoador.java | 27 +- .../loadors/FloatingObjectNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 12 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 14 +- .../ui/tree/loadors/RootNodeChildLoador.java | 25 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 24 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 4 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 1 + .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 2 + pom.xml | 39 +- src/site/site_fr.xml | 6 +- 71 files changed, 2020 insertions(+), 510 deletions(-) rename observe-business/src/main/java/fr/ird/observe/decorator/{TripDecorator.java => TripLonglineDecorator.java} (67%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineDAOImpl.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramDAOImpl.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java create mode 100644 observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-H2.sql create mode 100644 observe-entities/src/main/resources/db/4.0-RC2/clean-program-gear-type-PG.sql mode change 100644 => 100755 observe-swing/src/main/assembly/dist/obstuna-admin/apply-extra.sh create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/EntityNodeSupport.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java delete mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractAssociationNodeChildLoador.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 24

branch develop updated (3598cb3 -> 4baf239)
by codelutin.com scm April 7, 2015

April 7, 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 3598cb3 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development new 83abb77 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fcb6456 [maven-release-plugin] copy for tag observe-3.15.1 adds 2f5abad [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions new f5a7430 fix tests new b370ff0 add licenses headers new 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions new a723a7c Merge branch 'release/4.0-RC1' new 3d38290 Merge branch 'master' into develop new 4baf239 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 4baf2392b242783e96f8ced2a577641ec6c501b0 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3d3829019209ae1b3473d1a0703aef5218963f11 Merge: 83abb77 a723a7c Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:19 2015 +0000 Merge branch 'master' into develop commit 83abb7739e17e797164bb674f03bd1adebb30011 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:18 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a723a7c3b67f43ce1fc8a7d5166f1e52f18555fe Merge: fcb6456 6e2ec35 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:45:15 2015 +0000 Merge branch 'release/4.0-RC1' commit 6e2ec35ae990410eee9863b2837b98cc0441bea4 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:40:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions commit b370ff07766d7abbc686f67153305f044c8838fe Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:40:04 2015 +0000 add licenses headers commit f5a7430eea21e62671d9cc7390db4e727214032f Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 7 20:39:54 2015 +0000 fix tests Summary of changes: .../its/replication/AbstractReplicateDataTest.java | 7 ++++++- .../replication/H2LonglineReplicateDataTest.java | 23 ++++++++++++++++++++++ .../its/replication/ReplicationDataModel.java | 22 +++++++++++++++++++++ .../observe/entities/longline/TripLonglines.java | 22 +++++++++++++++++++++ .../DataSourceMigrationForVersion_3_16.java | 22 +++++++++++++++++++++ .../referentiel/GearCaracteristicTypes.java | 22 +++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-H2.sql | 21 ++++++++++++++++++++ .../main/resources/db/3.16/add-gear-data-PG.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-H2.sql | 21 ++++++++++++++++++++ .../resources/db/3.16/add-gear-referential-PG.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-H2.sql | 21 ++++++++++++++++++++ .../db/3.16/remove-tripSeine-seine-PG.sql | 21 ++++++++++++++++++++ .../ref/impl/GearCaracteristicTypeUIModel.java | 22 +++++++++++++++++++++ .../content/ref/impl/GearCaracteristicUIModel.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIHandler.java | 22 +++++++++++++++++++++ .../observe/ui/content/ref/impl/GearUIModel.java | 22 +++++++++++++++++++++ .../seine/GearUseFeatureMeasurementCellEditor.java | 22 +++++++++++++++++++++ .../GearUseFeatureMeasurementCellRenderer.java | 22 +++++++++++++++++++++ ...GearUseFeaturesMeasurementSeinesTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineTableModel.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 22 +++++++++++++++++++++ .../impl/seine/GearUseFeaturesSeineUIModel.java | 22 +++++++++++++++++++++ 22 files changed, 463 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 7

branch release/4.0-RC1 deleted (was 6e2ec35)
by codelutin.com scm April 7, 2015

April 7, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC1 in repository observe. See http://git.codelutin.com/observe.git was 6e2ec35 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' 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