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 819491b Nouvelle implantation du service de consolidation des données (termine #7488) Merge branch 'feature/7488' into develop new 0ef9322 Réactivitation des modules reset et de l'application web + Suppression d'objets non utiles et mise à jur de l'api de configuration pour les services rest new 1c7955d Rendre fermables les usines de services new b65d39b Mise en place du boot de l'application web (configuration, mapping, ...) (See 7494) new ea81a8f Suppresion des injectors, mise en place des controlleurs new 7dd673f Modélisation des configuration de base et chargement au démarrage de l'application web (See #7494) new 61245bc Modélisation des utilisateurs et chargement au démarrage de l'application web (See #7494) new 0ede2d6 Faire fonctionner le chargement dynamqieu de la configuration des logs new 4ef2b84 Permettre d'enregistrer les configurations de bases et d'utilisateurs même immuables (See #7494) new 177d80c Vérification des permissions des utilisateurs en utilisant la configurations des bases (See #7494) new 598e7c5 Utilisation aussi du label dans le calcul de l'égalité sur une configuration de source de type topia PG (on s'en sert pour différencier différentes configuration sur la même base) new ef3be40 ajout d'une usine de configuration de sources de données neutre au niveau du runner de services, nettoyage de code et passage en scope compile des différentes configurations new b2f08df Gestion de la sécurité de l'application web bien avancée. new e5c6cd2 Amélioration du contexte de requete avec l'introduction d'un context de sécurité au niveau de la requete new 506e017 Fix javadoc author new 177d73f Suppression du ObserveServiceContext et remplacement par un object qui permet d'initialiser le service new 6d20092 Préparation du client rest new 364eb14 Suppression du context applicatif au niveau des service, on utilise maintenant uniquement l'objet d'initialisation des services. new 26e197a Retour sur develop termine #7494 Merge branch 'feature/7494' into develop The 18 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 26e197a3c3db2ebb85442f353dfdfaddfc9b588a Merge: 819491b 364eb14 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 1 11:15:50 2015 +0200 Retour sur develop termine #7494 Merge branch 'feature/7494' into develop commit 364eb149a3aa76fbc4648f9c2beacb5136b3f2ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 1 11:15:10 2015 +0200 Suppression du context applicatif au niveau des service, on utilise maintenant uniquement l'objet d'initialisation des services. commit 6d2009206aaeb9dd3981fe52148ad54327055868 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 1 00:35:22 2015 +0200 Préparation du client rest commit 177d73f35d34e3f3aad8be4f0c685830b4f71ff3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 1 00:12:33 2015 +0200 Suppression du ObserveServiceContext et remplacement par un object qui permet d'initialiser le service commit 506e017250e5df7727a38a4990823a0d6f25920a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 31 07:26:34 2015 +0200 Fix javadoc author commit e5c6cd2b76880273468e120a315a984844595890 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 31 01:19:55 2015 +0200 Amélioration du contexte de requete avec l'introduction d'un context de sécurité au niveau de la requete commit b2f08df37f34be67f5b9664dac4516048f4078f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 31 00:30:59 2015 +0200 Gestion de la sécurité de l'application web bien avancée. Mais il faudrait revoir le requestContext car je ne suis pas satisfait de ce que j'ai fait, il vaudrait mieux introduire un RequestSecurityContext et n'avoir q'un seul type de RequestContext. (See #7494) commit ef3be40f607d1aeddaddb3e11a7047faf1a9f45e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 31 00:29:31 2015 +0200 ajout d'une usine de configuration de sources de données neutre au niveau du runner de services, nettoyage de code et passage en scope compile des différentes configurations commit 598e7c5ab19f0a1e85fde6824ab81f39d2a55cf7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 31 00:27:24 2015 +0200 Utilisation aussi du label dans le calcul de l'égalité sur une configuration de source de type topia PG (on s'en sert pour différencier différentes configuration sur la même base) commit 177d80cb4149cd329e3172f4d21f15990782e46c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 30 17:54:20 2015 +0200 Vérification des permissions des utilisateurs en utilisant la configurations des bases (See #7494) commit 4ef2b849b93ccc6878e113a1f3994341774adeea Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 30 16:09:51 2015 +0200 Permettre d'enregistrer les configurations de bases et d'utilisateurs même immuables (See #7494) commit 0ede2d64482f14b8c61790f02eff8eeaaad7e67d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 30 15:55:55 2015 +0200 Faire fonctionner le chargement dynamqieu de la configuration des logs commit 61245bc03c8de739eeac82ce3e3ebcb6f2964b1c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 30 15:23:32 2015 +0200 Modélisation des utilisateurs et chargement au démarrage de l'application web (See #7494) commit 7dd673f73869f5a724b4c2b4a6c259bde5d91372 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 30 14:15:19 2015 +0200 Modélisation des configuration de base et chargement au démarrage de l'application web (See #7494) commit ea81a8f26ca2bf01cf7a49f4bb9caf65774e1dae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 30 10:17:12 2015 +0200 Suppresion des injectors, mise en place des controlleurs commit b65d39b7c8cfed17ee12c31cdc0b7e9671cbd8d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 30 09:37:17 2015 +0200 Mise en place du boot de l'application web (configuration, mapping, ...) (See 7494) commit 1c7955d20cec577a1ad011233c26ad0a32a4810d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 16:07:50 2015 +0200 Rendre fermables les usines de services commit 0ef9322a16f08204fff12502db2a98394fdc0bad Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 13:56:08 2015 +0200 Réactivitation des modules reset et de l'application web + Suppression d'objets non utiles et mise à jur de l'api de configuration pour les services rest Summary of changes: observe-application-web/pom.xml | 92 ++++++- .../src/jetty/jetty-context.xml | 10 + .../application/web/ObserveServiceInjector.java | 55 ----- .../web/ObserveWebApplicationContext.java | 109 ++++++--- .../ObserveWebApplicationContextInitException.java | 16 ++ .../web/ObserveWebApplicationListener.java | 10 +- .../application/web/ObserveWebMotionFilter.java | 98 +++++++- .../web/ObserveWebMotionJsonHelper.java | 2 +- .../application/web/ObserveWebMotionRender.java | 4 +- .../application/web/ObserveWebRequestContext.java | 77 ------ .../ObserveWebApplicationConfiguration.java | 271 +++++++++++++++++++++ ...veWebApplicationConfigurationInitException.java | 19 ++ .../ObserveWebApplicationConfigurationOption.java | 110 +++++++++ ...ObserveWebApplicationConfigurationProvider.java | 39 +++ .../db/InvalidObserveWebDatabaseException.java | 15 ++ .../db/InvalidObserveWebDatabaseRoleException.java | 15 ++ .../db/InvalidObserveWebDatabasesException.java | 15 ++ .../web/configuration/db/ObserveWebDatabase.java | 24 ++ .../configuration/db/ObserveWebDatabaseRole.java | 14 ++ .../web/configuration/db/ObserveWebDatabases.java | 22 ++ .../db/ObserveWebDatabasesHelper.java | 178 ++++++++++++++ .../db/impl/ObserveWebDatabaseBean.java | 74 ++++++ .../db/impl/ObserveWebDatabaseImmutable.java | 88 +++++++ .../db/impl/ObserveWebDatabaseRoleBean.java | 37 +++ .../db/impl/ObserveWebDatabaseRoleImmutable.java | 37 +++ .../db/impl/ObserveWebDatabasesBean.java | 54 ++++ .../db/impl/ObserveWebDatabasesImmutable.java | 79 ++++++ .../user/InvalidObserveWebUserException.java | 15 ++ .../InvalidObserveWebUserPermissionException.java | 15 ++ .../user/InvalidObserveWebUsersException.java | 15 ++ .../web/configuration/user/ObserveWebUser.java | 22 ++ .../user/ObserveWebUserPermission.java | 14 ++ .../web/configuration/user/ObserveWebUsers.java | 18 ++ .../configuration/user/ObserveWebUsersHelper.java | 172 +++++++++++++ .../user/impl/ObserveWebUserBean.java | 65 +++++ .../user/impl/ObserveWebUserImmutable.java | 75 ++++++ .../user/impl/ObserveWebUserPermissionBean.java | 38 +++ .../impl/ObserveWebUserPermissionImmutable.java | 37 +++ .../user/impl/ObserveWebUsersBean.java | 43 ++++ .../user/impl/ObserveWebUsersImmutable.java | 56 +++++ .../web/controller/ObserveWebMotionController.java | 29 ++- .../web/controller/v1/ConfigurationController.java | 81 ++++++ .../controller/v1/DataSourceServiceController.java | 105 ++++++++ .../v1/ObserveServiceControllerSupport.java | 28 +++ .../v1/ReferentialServiceController.java | 36 +-- .../web/request/ObserveWebRequestContext.java | 108 ++++++++ .../request/ObserveWebRequestSecurityContext.java | 62 +++++ .../BadObserveWebUserPasswordException.java | 27 ++ ...urceConfigurationAlreadyRegistredException.java | 27 ++ .../InvalidAuthenticationTokenException.java | 22 ++ .../ObserveWebSecurityApplicationContext.java | 224 +++++++++++++++++ ...ObserveWebSecurityAuthenticationTokenCache.java | 84 +++++++ .../security/UnknownObserveWebUserException.java | 21 ++ .../UnknownObserveWebUserForDatabaseException.java | 27 ++ .../org.nuiton.config.ApplicationConfigProvider | 1 + .../src/main/resources/log4j.properties | 13 + observe-application-web/src/main/resources/mapping | 39 ++- .../src/main/resources/observeweb-log4j.conf | 21 ++ .../src/main/resources/observeweb.conf | 4 + .../db/ObserveWebDatabasesHelperTest.java | 241 ++++++++++++++++++ .../user/ObserveWebUsersHelperTest.java | 191 +++++++++++++++ .../fr/ird/observe/services/ObserveService.java | 2 - .../services/ObserveServiceApplicationContext.java | 81 ------ .../observe/services/ObserveServiceContext.java | 38 --- .../observe/services/ObserveServiceFactory.java | 12 +- .../services/ObserveServiceFactorySupport.java | 23 +- .../services/ObserveServiceInitializer.java | 99 ++++++++ .../ObserveDataSourceConfigurationRest.java | 25 +- .../ObserveDataSourceConfigurationTopiaPG.java | 6 +- .../services/ObserveServiceContextRest.java | 47 ---- .../services/ObserveServiceFactoryRest.java | 52 ++-- .../ird/observe/services/ObserveServiceRest.java | 20 -- observe-services-runner/pom.xml | 2 - .../ObserveDataSourceConfigurationMainFactory.java | 23 ++ .../services/ObserveServiceMainFactory.java | 27 +- .../services/ObserveServiceContextTopia.java | 73 +++--- .../services/ObserveServiceFactoryTopia.java | 29 ++- .../ird/observe/services/ObserveServiceTopia.java | 9 +- .../services/ApplicationContextResource.java | 30 +-- .../services/ObserveServiceContextTopiaTaiste.java | 5 + pom.xml | 117 +++++++-- 81 files changed, 3733 insertions(+), 527 deletions(-) create mode 100644 observe-application-web/src/jetty/jetty-context.xml delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveServiceInjector.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContextInitException.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebRequestContext.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationInitException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationOption.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfigurationProvider.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabaseRoleException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/InvalidObserveWebDatabasesException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabase.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabaseRole.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabases.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseBean.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseImmutable.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleBean.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabaseRoleImmutable.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesBean.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/db/impl/ObserveWebDatabasesImmutable.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUserPermissionException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/InvalidObserveWebUsersException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUser.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUserPermission.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsers.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserBean.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserImmutable.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionBean.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUserPermissionImmutable.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersBean.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/user/impl/ObserveWebUsersImmutable.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestSecurityContext.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/DataSourceConfigurationAlreadyRegistredException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java create mode 100644 observe-application-web/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider create mode 100644 observe-application-web/src/main/resources/log4j.properties create mode 100644 observe-application-web/src/main/resources/observeweb-log4j.conf create mode 100644 observe-application-web/src/main/resources/observeweb.conf create mode 100644 observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java create mode 100644 observe-application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceApplicationContext.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java delete mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java create mode 100644 observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.