This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git 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 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.