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

branch develop updated (f83390a -> 3ba428e)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 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 f83390a Utiliser un moteur de template pour générer le rendu des résumés d'action (Termine #7547) Merge branch 'feature/7547' into develop new ff31642 ajout du DTO pour les utilisateurs de la base PG (refs #7549) new 6e20360 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) new 34b2c0e renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) new 8ec40fe ajout du converter pour les DTO (refs #7549) new bfcd27c migration des tâches administratives, mise ren place de la Sécurité (refs #7549) new 600a69c miragtion des base de données (refs #7549) new e324081 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) new 3457320 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) new 6910618 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) new 5d38d12 rendre serializable la connexion a une source de donnees new 61939e6 fix typo new 9ca1de5 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean new 3ba428e Retour sur develop pour pouvoir utiliser la partie ouverture de base (RAF la creation d'une base locale). Merge branch 'feature/7549' into develop The 13 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 3ba428e4cd137332f29ec010b37567281f63775f Merge: f83390a 9ca1de5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 17:24:41 2015 +0200 Retour sur develop pour pouvoir utiliser la partie ouverture de base (RAF la creation d'une base locale). Merge branch 'feature/7549' into develop commit 9ca1de5071aceb4ec8b4fe32326fe4771714ca4c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 16:59:19 2015 +0200 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean commit 61939e6ecf4092efe258e27e7316f43c5eba59cb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 16:48:44 2015 +0200 fix typo commit 5d38d122e12394d59e6afcaf9c9ad091a446bb1b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 16:48:03 2015 +0200 rendre serializable la connexion a une source de donnees commit 6910618ff8f85c397bda93c616688cda3a9058b6 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 2 15:16:33 2015 +0200 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) commit 3457320497a7919b3e888b125e2b736a3dc0b398 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 1 16:37:53 2015 +0200 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) commit e3240813a121b70372f42468b30aff5ddfc0e987 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 17:53:37 2015 +0200 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) commit 600a69cdb2419cf151c743a91177d65c88b88004 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 16:07:44 2015 +0200 miragtion des base de données (refs #7549) commit bfcd27c09e6ba89f6879d500b611f953fbe88ba4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 09:50:39 2015 +0200 migration des tâches administratives, mise ren place de la Sécurité (refs #7549) commit 8ec40fefe7b49a496b5ca95cae8326ce9a9d420b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 09:46:03 2015 +0200 ajout du converter pour les DTO (refs #7549) commit 34b2c0e0a41e4eb689e03b167440abe13eb51556 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 09:45:11 2015 +0200 renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) commit 6e20360f9c13fe59637027f9867afd758ea858c2 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 29 10:59:00 2015 +0200 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) commit ff316428c0b7dbc7b862c873dbbb8497dbc97cda Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 29 10:50:34 2015 +0200 ajout du DTO pour les utilisateurs de la base PG (refs #7549) Summary of changes: .../main/java/fr/ird/observe/ObserveCLAction.java | 6 - .../observe/ObserveSwingApplicationContext.java | 38 +- .../ird/observe/business/util/SecurityModel.java | 217 ---------- .../ObserveSwingApplicationConfig.java | 9 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 116 ++++-- .../java/fr/ird/observe/db/constantes/DbMode.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 11 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 3 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 455 ++++++++++++--------- .../ird/observe/ui/storage/RemoteUILauncher.java | 48 +-- .../ird/observe/ui/storage/StorageUIHandler.java | 96 +++-- .../fr/ird/observe/ui/storage/StorageUIModel.java | 94 +++-- .../observe/ui/storage/tabs/RolesTableModel.java | 62 ++- .../fr/ird/observe/ui/storage/tabs/RolesUI.css | 2 +- .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 2 +- .../ird/observe/ui/storage/tabs/SecurityModel.java | 174 ++++++++ .../ftl/dataSourceConnectionReport_fr.ftl | 20 +- .../observe-application-swing_en_GB.properties | 5 + .../observe-application-swing_es_ES.properties | 5 + .../observe-application-swing_fr_FR.properties | 5 + .../web/ObserveWebApplicationContext.java | 6 +- .../web/ObserveWebApplicationListener.java | 3 + .../ObserveWebApplicationConfiguration.java | 10 + .../ObserveWebApplicationConfigurationOption.java | 2 + .../controller/v1/DataSourceServiceController.java | 29 +- .../web/controller/v1/PingServiceController.java | 11 +- .../ObserveDtoConverter.java} | 34 +- .../web/injector/ObserveDtoInjector.java | 30 +- .../ObserveWebSecurityApplicationContext.java | 6 +- .../src/main/resources/observeweb.conf | 3 +- .../migration/AbstractDataSourceMigration.java | 61 ++- .../i18n/observe-entities_en_GB.properties | 4 - .../i18n/observe-entities_es_ES.properties | 4 - .../i18n/observe-entities_fr_FR.properties | 4 - .../services/service/BabModelVersionException.java | 34 ++ .../services/service/DataSourceService.java | 28 +- .../ird/observe/services/service/PingService.java | 5 +- .../ObserveDataSourceConfiguration.java | 4 + .../configuration/ObserveDataSourceConnection.java | 4 +- .../ObserveDataSourceConnectionSupport.java | 2 + .../ObserveDataSourceInformation.java | 62 +++ .../ObserveDataSourceConfigurationRest.java | 17 + .../ObserveDataSourceConnectionRest.java | 2 + ...ObserveDataSourceConfigurationTopiaSupport.java | 13 + .../ObserveDataSourceConnectionTopia.java | 2 + .../observe/services/dto/ObserveDbUserDtos.java | 22 + .../services/dto/constants/ObserveDbRole.java | 14 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 36919 -> 39020 bytes .../fr/ird/observe/services/TestClassResource.java | 5 + .../ird/observe/services/TestMethodResource.java | 10 +- .../service/DataSourceServiceRestTest.java | 4 +- .../ObserveDataSourceConfigurationMainFactory.java | 13 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 154 +++++++ .../observe/services/ObserveSecurityHelper.java | 306 ++++++++++++++ .../services/dto/ObserveDtosInitializer.java | 5 + .../services/service/DataSourceServiceTopia.java | 141 ++++++- .../i18n/observe-services-topia_en_GB.properties | 1 + .../i18n/observe-services-topia_es_ES.properties | 1 + .../i18n/observe-services-topia_fr_FR.properties | 1 + .../services/ApplicationContextResource.java | 3 + .../ObserveDataSourceConnectionTopiaTaiste.java | 2 + .../services/service/AbstractServiceTopiaTest.java | 2 +- .../service/DataSourceServiceTopiaTest.java | 6 +- .../fr/ird/observe/services/service/RigthTest.java | 36 +- .../main/java/fr/ird/observe/test/TestHelper.java | 32 ++ .../src/main/resources/observetest.properties | 3 + 67 files changed, 1777 insertions(+), 737 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/business/util/SecurityModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java copy observe-application-web/src/main/java/fr/ird/observe/application/web/{injector/ObserveDtoInjector.java => converter/ObserveDtoConverter.java} (59%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java create mode 100644 observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceInformation.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ObserveDbUserDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ObserveDbRole.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java create mode 100644 observe-test-data/src/main/resources/observetest.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 13

branch feature/7549 deleted (was 9ca1de5)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git was 9ca1de5 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean This change permanently discards the following revisions: discards 9ca1de5 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean discards 61939e6 fix typo discards 5d38d12 rendre serializable la connexion a une source de donnees discards 6910618 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) discards 3457320 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) discards e324081 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) discards 600a69c miragtion des base de données (refs #7549) discards bfcd27c migration des tâches administratives, mise ren place de la Sécurité (refs #7549) discards 8ec40fe ajout du converter pour les DTO (refs #7549) discards 34b2c0e renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) discards 6e20360 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) discards ff31642 ajout du DTO pour les utilisateurs de la base PG (refs #7549) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7549 updated (6910618 -> 9ca1de5)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git from 6910618 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) new 5d38d12 rendre serializable la connexion a une source de donnees new 61939e6 fix typo new 9ca1de5 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean 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 9ca1de5071aceb4ec8b4fe32326fe4771714ca4c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 16:59:19 2015 +0200 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean commit 61939e6ecf4092efe258e27e7316f43c5eba59cb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 16:48:44 2015 +0200 fix typo commit 5d38d122e12394d59e6afcaf9c9ad091a446bb1b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 16:48:03 2015 +0200 rendre serializable la connexion a une source de donnees Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 ++--- .../fr/ird/observe/db/ObserveSwingDataSource.java | 44 +++++++++++----------- .../java/fr/ird/observe/db/constantes/DbMode.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 8 ++-- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../configuration/ObserveDataSourceConnection.java | 4 +- .../ObserveDataSourceConnectionSupport.java | 2 + .../ObserveDataSourceConnectionRest.java | 2 + .../ObserveDataSourceConnectionTopia.java | 2 + .../ObserveDataSourceConnectionTopiaTaiste.java | 2 + 10 files changed, 44 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 3

branch feature/7549 updated (c2dc6f3 -> 6910618)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git discards c2dc6f3 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) discards 853519a migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) discards 7791a1f miragtion des base de données (refs #7549) discards 5083a88 migration des tâches administratives, mise ren place de la Sécurité (refs #7549) discards 9392bae ajout du converter pour les DTO (refs #7549) discards 827ce41 renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) discards 65ebe2e ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) discards 3116433 ajout du DTO pour les utilisateurs de la base PG (refs #7549) adds da72826 début d'utilisation des services dans doSave et doDelete (refs #7531) adds 48e222f utilisation des services dans doSave et doDelete adds 1301e7e début d'utilisation des services dans doSave et doDelete (refs #7531) adds 28d8c9c utilisation des services dans doSave et doDelete adds 18f6d90 Fix merge adds eb48311 appel des services pour le load et precreate (refs #7531) adds b878fd0 appel de services dans dopersist (refs #7531) adds 3f33c38 suppression des fixme (refs #7531) adds 5788fd3 utilisation des services dans getChilds des lists (refs #7531) adds a34fca2 fix tests + chargement du parent dans les listes (refs #7531) adds ed2dfa8 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) adds 413a37a fix des services pour recuperer les stubsdto (refs #7531) adds 6cbffa6 modif d'une mauvais classe de DTO (refs #7531) adds c4b0e75 Fix merges adds 248c1f6 mise en place du générateur de text (refs #7547) adds 0e8bc21 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) adds f83390a Utiliser un moteur de template pour générer le rendu des résumés d'action (Termine #7547) Merge branch 'feature/7547' into develop new ff31642 ajout du DTO pour les utilisateurs de la base PG (refs #7549) new 6e20360 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) new 34b2c0e renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) new 8ec40fe ajout du converter pour les DTO (refs #7549) new bfcd27c migration des tâches administratives, mise ren place de la Sécurité (refs #7549) new 600a69c miragtion des base de données (refs #7549) new e324081 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) new 3457320 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) new 6910618 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c2dc6f3) \ N -- N -- N refs/heads/feature/7549 (6910618) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 9 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 6910618ff8f85c397bda93c616688cda3a9058b6 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 2 15:16:33 2015 +0200 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) commit 3457320497a7919b3e888b125e2b736a3dc0b398 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 1 16:37:53 2015 +0200 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) commit e3240813a121b70372f42468b30aff5ddfc0e987 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 17:53:37 2015 +0200 migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) commit 600a69cdb2419cf151c743a91177d65c88b88004 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 16:07:44 2015 +0200 miragtion des base de données (refs #7549) commit bfcd27c09e6ba89f6879d500b611f953fbe88ba4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 09:50:39 2015 +0200 migration des tâches administratives, mise ren place de la Sécurité (refs #7549) commit 8ec40fefe7b49a496b5ca95cae8326ce9a9d420b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 09:46:03 2015 +0200 ajout du converter pour les DTO (refs #7549) commit 34b2c0e0a41e4eb689e03b167440abe13eb51556 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 30 09:45:11 2015 +0200 renomage en observeDbUserDto et ajout du role d'administrator (refs #7549) commit 6e20360f9c13fe59637027f9867afd758ea858c2 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 29 10:59:00 2015 +0200 ajout des méthodes de service pour gérer la securité des bases PG (refs #7549) commit ff316428c0b7dbc7b862c873dbbb8497dbc97cda Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Sep 29 10:50:34 2015 +0200 ajout du DTO pour les utilisateurs de la base PG (refs #7549) Summary of changes: observe-application-swing/pom.xml | 6 + .../java/fr/ird/observe/ObserveServiceHelper.java | 27 +- .../observe/ObserveSwingApplicationContext.java | 34 +- .../java/fr/ird/observe/ObserveTextGenerator.java | 104 ++++++ .../fr/ird/observe/db/ObserveSwingDataSource.java | 3 +- .../java/fr/ird/observe/ui/DecoratorService.java | 49 +-- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 9 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 48 ++- .../observe/ui/actions/ShowStorageInfoAction.java | 15 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 12 - .../ird/observe/ui/content/ContentUIHandler.java | 98 +----- .../observe/ui/content/ContentUIInitializer.java | 202 +++++------- .../ird/observe/ui/content/ContentUIManager.java | 64 ++-- .../content/impl/longline/BranchlineUIHandler.java | 35 +-- .../LonglineDetailCompositionUIHandler.java | 36 ++- .../LonglineDetailCompositionUIInitializer.java | 4 - .../longline/LonglineDetailCompositionUIModel.java | 7 - .../impl/longline/SetLonglineUIHandler.java | 105 +++---- .../ActivitySeineObservedSystemUIHandler.java | 32 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 129 ++++---- ...tingObjectTransmittingBuoyOperationUIModel.java | 16 +- .../impl/seine/FloatingObjectUIHandler.java | 92 +++--- .../ui/content/impl/seine/SetSeineUIHandler.java | 117 ++++--- .../ui/content/list/ContentListUIHandler.java | 7 +- .../impl/longline/ActivityLonglinesUIHandler.java | 36 ++- .../list/impl/longline/TripLonglinesUIHandler.java | 38 ++- .../list/impl/seine/ActivitySeinesUIHandler.java | 36 ++- .../content/list/impl/seine/RoutesUIHandler.java | 36 ++- .../list/impl/seine/TripSeinesUIHandler.java | 40 ++- .../ui/content/open/ContentOpenableUIHandler.java | 18 +- .../impl/longline/ActivityLonglineUIHandler.java | 178 +++++------ .../open/impl/longline/TripLonglineUIHandler.java | 138 ++++---- .../open/impl/seine/ActivitySeineUIHandler.java | 132 ++++---- .../ui/content/open/impl/seine/RouteUIHandler.java | 164 +++++----- .../open/impl/seine/TripSeineUIHandler.java | 163 +++++----- .../ui/content/ref/ContentReferenceUIHandler.java | 241 +++++++------- .../ui/content/table/ContentTableUIHandler.java | 97 +++--- .../ui/content/table/ContentTableUIModel.java | 19 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 11 +- .../impl/longline/BaitsCompositionUIHandler.java | 26 +- .../impl/longline/BaitsCompositionUIModel.java | 9 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 11 +- .../longline/BranchlinesCompositionUIHandler.java | 31 +- .../longline/BranchlinesCompositionUIModel.java | 8 +- .../impl/longline/CatchLonglineUIHandler.java | 30 +- .../table/impl/longline/EncounterUIHandler.java | 24 +- .../longline/FloatlinesCompositionUIHandler.java | 26 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 29 +- .../impl/longline/HooksCompositionUIHandler.java | 26 +- .../table/impl/longline/SensorUsedUIHandler.java | 21 +- .../content/table/impl/longline/TdrUIHandler.java | 21 +- .../impl/longline/WeightMeasuresTableModel.java | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 29 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 20 ++ .../table/impl/seine/NonTargetSampleUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 21 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/SchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/TargetCatchUIHandler.java | 20 ++ .../impl/seine/TargetDiscardCatchUIHandler.java | 49 ++- .../table/impl/seine/TargetSampleUIHandler.java | 22 ++ .../ird/observe/ui/storage/StorageUIHandler.java | 338 +------------------- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 5 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 3 +- .../ui/storage/tabs/DataSelectionModel.java | 26 +- .../ird/observe/ui/storage/tabs/SecurityModel.java | 25 ++ .../ui/storage/tabs/StorageTabUIHandler.java | 41 +-- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 11 - .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 12 - .../EditableTableWithCacheTableModelSupport.java | 24 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 20 ++ .../ftl/dataSourceConnectionReport_fr.ftl | 348 +++++++++++++++++++++ .../resources/ftl/dataSourceInformation_fr.ftl | 54 ++++ .../ftl/dataSourceSelectModeResume_fr.ftl | 40 +++ .../ftl/storageModelDataSourceConfiguration_fr.ftl | 18 ++ .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + .../v1/ReferentialServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 14 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 9 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 9 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 14 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 9 +- .../services/service/ReferentialService.java | 2 +- .../service/longline/ActivityLonglineService.java | 13 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/longline/SetLonglineService.java | 2 +- .../service/longline/TripLonglineService.java | 7 +- .../seine/ActivitySeineObservedSystemService.java | 2 +- .../service/seine/ActivitySeineService.java | 7 +- .../service/seine/FloatingObjectService.java | 2 +- .../service/seine/NonTargetSampleService.java | 2 +- .../services/service/seine/RouteService.java | 10 +- .../services/service/seine/SetSeineService.java | 2 +- .../service/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../services/service/seine/TripSeineService.java | 7 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 37572 -> 39020 bytes .../service/seine/TripSeineServiceRestTest.java | 46 +-- .../services/dto/ObserveDtosInitializer.java | 5 + .../services/service/ReferentialServiceTopia.java | 6 +- .../longline/ActivityLonglineServiceTopia.java | 60 +++- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +- .../service/longline/SetLonglineServiceTopia.java | 4 +- .../service/longline/TripLonglineServiceTopia.java | 40 ++- .../ActivitySeineObservedSystemServiceTopia.java | 4 +- .../service/seine/ActivitySeineServiceTopia.java | 42 ++- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../service/seine/NonTargetSampleServiceTopia.java | 4 +- .../services/service/seine/RouteServiceTopia.java | 62 +++- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetSampleServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- .../service/seine/TripSeineServiceTopia.java | 40 ++- .../fr/ird/observe/services/service/RigthTest.java | 4 +- .../service/seine/TripSeineServiceTopiaTest.java | 46 +-- pom.xml | 7 + 128 files changed, 2549 insertions(+), 2060 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java create mode 100644 observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 9

branch develop updated (4ce182d -> f83390a)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 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 4ce182d Démarage de client swing (termine #7328) estion des data source dans l'application swing (termine #7529) Merge branch 'feature/7528' into develop new da72826 début d'utilisation des services dans doSave et doDelete (refs #7531) new 48e222f utilisation des services dans doSave et doDelete new 1301e7e début d'utilisation des services dans doSave et doDelete (refs #7531) new 28d8c9c utilisation des services dans doSave et doDelete new 18f6d90 Fix merge new eb48311 appel des services pour le load et precreate (refs #7531) new b878fd0 appel de services dans dopersist (refs #7531) new 3f33c38 suppression des fixme (refs #7531) new 5788fd3 utilisation des services dans getChilds des lists (refs #7531) new a34fca2 fix tests + chargement du parent dans les listes (refs #7531) new ed2dfa8 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) new 413a37a fix des services pour recuperer les stubsdto (refs #7531) new 6cbffa6 modif d'une mauvais classe de DTO (refs #7531) new c4b0e75 Fix merges new 248c1f6 mise en place du générateur de text (refs #7547) new 0e8bc21 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) new f83390a Utiliser un moteur de template pour générer le rendu des résumés d'action (Termine #7547) Merge branch 'feature/7547' into develop The 17 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 f83390ab503eb29c8292e3b10c65535521eebf6d Merge: c4b0e75 0e8bc21 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 11:52:14 2015 +0200 Utiliser un moteur de template pour générer le rendu des résumés d'action (Termine #7547) Merge branch 'feature/7547' into develop commit 0e8bc2176e6eed1b30490384ec293cb04d6386dc Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 2 11:29:19 2015 +0200 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) commit 248c1f68bd20115e5fd9d882839399613c84d765 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Sep 28 09:55:57 2015 +0200 mise en place du générateur de text (refs #7547) commit c4b0e75e2edccc86c497ad9719ffc772587beed2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 2 11:48:34 2015 +0200 Fix merges commit 6cbffa6627beaef45d90208c5734b17ff85486b9 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 29 14:44:12 2015 +0200 modif d'une mauvais classe de DTO (refs #7531) commit 413a37ab143e1d2040e1f4fc096760c9cbbb2edb Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 29 11:08:43 2015 +0200 fix des services pour recuperer les stubsdto (refs #7531) commit ed2dfa8a1ab9bb0353e7af55fc4fcade99f3cc39 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 28 18:54:27 2015 +0200 fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) commit a34fca23496d08933824ebfaa449f7006ac43b9b Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 28 18:10:03 2015 +0200 fix tests + chargement du parent dans les listes (refs #7531) commit 5788fd3703e5130023c0c889b8ca7148f38dc765 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 28 17:40:07 2015 +0200 utilisation des services dans getChilds des lists (refs #7531) commit 3f33c387644698dc15830836d9287ff1cbb013cf Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 28 16:27:01 2015 +0200 suppression des fixme (refs #7531) commit b878fd0ecc90e0576031a2981cd6da951e0b538f Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 25 17:03:15 2015 +0200 appel de services dans dopersist (refs #7531) commit eb4831192d1324325e3b1752241d94873b2d0aa7 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 25 11:32:25 2015 +0200 appel des services pour le load et precreate (refs #7531) commit 18f6d90066868c465a56b2a501e1205560a65847 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Sep 24 19:26:43 2015 +0200 Fix merge commit 28d8c9cbf1763a993999ffa190d1cf13e15dba8b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit 1301e7e568b354feff89b9870eddd69bed2739c8 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) commit 48e222feba23457b1ee0b9e7932704fc2b44c124 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit da72826c7e01465b1291e1649796410afcd91f78 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) Summary of changes: observe-application-swing/pom.xml | 6 + .../main/java/fr/ird/observe/ObserveCLAction.java | 3 +- .../java/fr/ird/observe/ObserveServiceHelper.java | 27 +- .../observe/ObserveSwingApplicationContext.java | 34 +- .../java/fr/ird/observe/ObserveTextGenerator.java | 104 ++++++ .../fr/ird/observe/db/ObserveSwingDataSource.java | 3 +- .../java/fr/ird/observe/ui/DecoratorService.java | 49 +-- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 9 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 48 ++- .../observe/ui/actions/ShowStorageInfoAction.java | 15 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 12 - .../ird/observe/ui/content/ContentUIHandler.java | 98 +----- .../observe/ui/content/ContentUIInitializer.java | 202 +++++------- .../ird/observe/ui/content/ContentUIManager.java | 64 ++-- .../content/impl/longline/BranchlineUIHandler.java | 35 +- .../LonglineDetailCompositionUIHandler.java | 36 ++- .../LonglineDetailCompositionUIInitializer.java | 4 - .../longline/LonglineDetailCompositionUIModel.java | 7 - .../impl/longline/SetLonglineUIHandler.java | 105 +++--- .../ActivitySeineObservedSystemUIHandler.java | 32 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 129 ++++---- ...tingObjectTransmittingBuoyOperationUIModel.java | 16 +- .../impl/seine/FloatingObjectUIHandler.java | 92 +++--- .../ui/content/impl/seine/SetSeineUIHandler.java | 117 ++++--- .../ui/content/list/ContentListUIHandler.java | 7 +- .../impl/longline/ActivityLonglinesUIHandler.java | 36 ++- .../list/impl/longline/TripLonglinesUIHandler.java | 38 ++- .../list/impl/seine/ActivitySeinesUIHandler.java | 36 ++- .../content/list/impl/seine/RoutesUIHandler.java | 36 ++- .../list/impl/seine/TripSeinesUIHandler.java | 40 ++- .../ui/content/open/ContentOpenableUIHandler.java | 18 +- .../impl/longline/ActivityLonglineUIHandler.java | 178 +++++------ .../open/impl/longline/TripLonglineUIHandler.java | 138 ++++---- .../open/impl/seine/ActivitySeineUIHandler.java | 132 ++++---- .../ui/content/open/impl/seine/RouteUIHandler.java | 164 +++++----- .../open/impl/seine/TripSeineUIHandler.java | 163 +++++----- .../ui/content/ref/ContentReferenceUIHandler.java | 241 +++++++------- .../ui/content/table/ContentTableUIHandler.java | 97 +++--- .../ui/content/table/ContentTableUIModel.java | 19 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 11 +- .../impl/longline/BaitsCompositionUIHandler.java | 26 +- .../impl/longline/BaitsCompositionUIModel.java | 9 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 11 +- .../longline/BranchlinesCompositionUIHandler.java | 31 +- .../longline/BranchlinesCompositionUIModel.java | 8 +- .../impl/longline/CatchLonglineUIHandler.java | 30 +- .../table/impl/longline/EncounterUIHandler.java | 24 +- .../longline/FloatlinesCompositionUIHandler.java | 26 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 29 +- .../impl/longline/HooksCompositionUIHandler.java | 26 +- .../table/impl/longline/SensorUsedUIHandler.java | 21 +- .../content/table/impl/longline/TdrUIHandler.java | 21 +- .../impl/longline/WeightMeasuresTableModel.java | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 29 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 20 ++ .../table/impl/seine/NonTargetSampleUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 21 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/SchoolEstimateUIHandler.java | 20 ++ .../table/impl/seine/TargetCatchUIHandler.java | 20 ++ .../impl/seine/TargetDiscardCatchUIHandler.java | 49 ++- .../table/impl/seine/TargetSampleUIHandler.java | 22 ++ .../ird/observe/ui/storage/StorageUIHandler.java | 352 +-------------------- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 5 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 3 +- .../ui/storage/tabs/DataSelectionModel.java | 26 +- .../ui/storage/tabs/StorageTabUIHandler.java | 41 +-- .../fr/ird/observe/ui/tree/DtoNodeSupport.java | 11 - .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 12 - .../EditableTableWithCacheTableModelSupport.java | 24 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 5 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 20 ++ .../ftl/dataSourceConnectionReport_fr.ftl | 348 ++++++++++++++++++++ .../resources/ftl/dataSourceInformation_fr.ftl | 54 ++++ .../ftl/dataSourceSelectModeResume_fr.ftl | 40 +++ .../ftl/storageModelDataSourceConfiguration_fr.ftl | 18 ++ .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + .../v1/ReferentialServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 14 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 9 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 9 +- .../v1/seine/FloatingObjectServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 14 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 9 +- .../services/service/ReferentialService.java | 2 +- .../service/longline/ActivityLonglineService.java | 13 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/longline/SetLonglineService.java | 2 +- .../service/longline/TripLonglineService.java | 7 +- .../seine/ActivitySeineObservedSystemService.java | 2 +- .../service/seine/ActivitySeineService.java | 7 +- .../service/seine/FloatingObjectService.java | 2 +- .../service/seine/NonTargetSampleService.java | 2 +- .../services/service/seine/RouteService.java | 10 +- .../services/service/seine/SetSeineService.java | 2 +- .../service/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../services/service/seine/TripSeineService.java | 7 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 35328 -> 36919 bytes .../service/seine/TripSeineServiceRestTest.java | 46 +-- .../services/dto/ObserveDtosInitializer.java | 5 + .../services/service/ReferentialServiceTopia.java | 6 +- .../longline/ActivityLonglineServiceTopia.java | 60 +++- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +- .../service/longline/SetLonglineServiceTopia.java | 4 +- .../service/longline/TripLonglineServiceTopia.java | 40 ++- .../ActivitySeineObservedSystemServiceTopia.java | 4 +- .../service/seine/ActivitySeineServiceTopia.java | 42 ++- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../service/seine/NonTargetSampleServiceTopia.java | 4 +- .../services/service/seine/RouteServiceTopia.java | 62 +++- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetSampleServiceTopia.java | 4 +- .../TransmittingBuoyOperationServiceTopia.java | 4 +- .../service/seine/TripSeineServiceTopia.java | 40 ++- .../fr/ird/observe/services/service/RigthTest.java | 4 +- .../service/seine/TripSeineServiceTopiaTest.java | 46 +-- pom.xml | 7 + 128 files changed, 2526 insertions(+), 2075 deletions(-) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java create mode 100644 observe-application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl create mode 100644 observe-application-swing/src/main/resources/ftl/storageModelDataSourceConfiguration_fr.ftl -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 17

branch feature/7547 deleted (was e333597)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7547 in repository observe. See http://git.codelutin.com/observe.git was e333597 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) This change permanently discards the following revisions: discards e333597 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) discards 07383c7 mise en place du générateur de text (refs #7547) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7531 deleted (was 29a3a9d)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git was 29a3a9d modif d'une mauvais classe de DTO (refs #7531) This change permanently discards the following revisions: discards 29a3a9d modif d'une mauvais classe de DTO (refs #7531) discards 4bdd03d fix des services pour recuperer les stubsdto (refs #7531) discards b162a1f fix tests et compilation (ils ne passent pas mais ça compile) (refs #7531) discards 8f12626 fix tests + chargement du parent dans les listes (refs #7531) discards 20e26b1 utilisation des services dans getChilds des lists (refs #7531) discards f12b43c suppression des fixme (refs #7531) discards 71a5e4e appel de services dans dopersist (refs #7531) discards f0f27e6 appel des services pour le load et precreate (refs #7531) discards eefe001 Merge branch 'feature/7531' of https://git.codelutin.com/observe into feature/7531 discards 3f97619 Fix merge discards 4a26bd2 utilisation des services dans doSave et doDelete discards e11ff67 début d'utilisation des services dans doSave et doDelete (refs #7531) discards a74653a utilisation des services dans doSave et doDelete discards e6cec26 début d'utilisation des services dans doSave et doDelete (refs #7531) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7547 updated (07383c7 -> e333597)
by codelutin.com scm Oct. 2, 2015

Oct. 2, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7547 in repository observe. See http://git.codelutin.com/observe.git from 07383c7 mise en place du générateur de text (refs #7547) new e333597 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) 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 e3335977ac7d3c2675b208b7fbe4322bc8d19e3c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Oct 2 11:29:19 2015 +0200 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) Summary of changes: .../main/java/fr/ird/observe/ObserveServiceHelper.java | 13 +++++++++++++ .../fr/ird/observe/ObserveSwingApplicationContext.java | 18 ++++++++++++++++++ .../main/java/fr/ird/observe/ObserveTextGenerator.java | 16 +++++++--------- .../ird/observe/ui/actions/ShowStorageInfoAction.java | 4 +++- .../fr/ird/observe/ui/storage/StorageUIHandler.java | 4 +++- .../observe/ui/storage/tabs/StorageTabUIHandler.java | 8 ++++++-- 6 files changed, 50 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 1

branch feature/7553 updated (53e2380 -> 148c047)
by codelutin.com scm Oct. 1, 2015

Oct. 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553 in repository observe. See http://git.codelutin.com/observe.git from 53e2380 affichage des icones des noeuds (refs #7553) new 148c047 fix id (refs #7553) 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 148c0474d08eb1c4f7182111ca85b57259bd0920 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Oct 1 18:10:27 2015 +0200 fix id (refs #7553) Summary of changes: .../java/fr/ird/observe/services/service/seine/RouteServiceTopia.java | 2 +- 1 file 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 1

branch feature/7549 updated (853519a -> c2dc6f3)
by codelutin.com scm Oct. 1, 2015

Oct. 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git from 853519a migrer une base sans l'ouvrir, verification de la version de la base local au chargement et migration si nécessaire (refs #7549) new c2dc6f3 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) 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 c2dc6f30306756f621ae89b9d330267d4bca601f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Oct 1 16:37:53 2015 +0200 verification des versions a la connection avec un serveur et a l'ouverture de la base (refs #7549) Summary of changes: .../observe/ObserveSwingApplicationContext.java | 6 ++- .../ObserveSwingApplicationConfig.java | 9 ++-- .../fr/ird/observe/db/ObserveSwingDataSource.java | 3 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 3 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 3 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 3 +- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 52 +++++++++++++++------- .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + .../web/ObserveWebApplicationContext.java | 6 ++- .../ObserveWebApplicationConfiguration.java | 10 +++++ .../ObserveWebApplicationConfigurationOption.java | 2 + .../controller/v1/DataSourceServiceController.java | 3 +- .../web/controller/v1/PingServiceController.java | 11 ++++- .../ObserveWebSecurityApplicationContext.java | 6 ++- .../src/main/resources/observeweb.conf | 3 +- .../migration/AbstractDataSourceMigration.java | 4 ++ .../services/service/BabModelVersionException.java | 34 ++++++++++++++ .../services/service/DataSourceService.java | 2 +- .../ird/observe/services/service/PingService.java | 5 +-- .../ObserveDataSourceConfiguration.java | 4 ++ .../ObserveDataSourceConfigurationRest.java | 17 +++++++ ...ObserveDataSourceConfigurationTopiaSupport.java | 13 ++++++ .../fr/ird/observe/services/TestClassResource.java | 5 +++ .../ird/observe/services/TestMethodResource.java | 10 +++-- .../service/DataSourceServiceRestTest.java | 4 +- .../ObserveDataSourceConfigurationMainFactory.java | 13 ++++-- .../services/service/DataSourceServiceTopia.java | 13 +++++- .../i18n/observe-services-topia_en_GB.properties | 1 + .../i18n/observe-services-topia_es_ES.properties | 1 + .../i18n/observe-services-topia_fr_FR.properties | 1 + .../services/ApplicationContextResource.java | 3 ++ .../services/service/AbstractServiceTopiaTest.java | 2 +- .../service/DataSourceServiceTopiaTest.java | 6 +-- .../fr/ird/observe/services/service/RigthTest.java | 36 ++++++++------- .../main/java/fr/ird/observe/test/TestHelper.java | 32 +++++++++++++ .../src/main/resources/observetest.properties | 3 ++ 40 files changed, 269 insertions(+), 68 deletions(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/BabModelVersionException.java create mode 100644 observe-test-data/src/main/resources/observetest.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1