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@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@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@codelutin.com> Date: Fri Oct 2 16:48:44 2015 +0200 fix typo commit 5d38d122e12394d59e6afcaf9c9ad091a446bb1b Author: Tony CHEMIT <chemit@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@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@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@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@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@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@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@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@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@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@list.forge.codelutin.com>.