This is an automated email from the git hooks/post-receive script. New change to branch master-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git from 2a426c4 Merge branch 'release/1.0.1' adds 8a74380 configuration du pom pour que les releases 1.0.x utilisent sur les bonnes branches adds 2239ef0 fixes #7844 correction des chaines i18n pour le sujet de courriel de modification du mot de passe adds 9682651 fixes #7845 Add a health page to controle application status adds ed6d52a bundle module should be deployed adds d2ad5b3 idiot, change version to snapshot adds 5fb321e [jgitflow-maven-plugin]updating poms for 1.0.2 branch with snapshot versions adds c7b15ec update file headers adds 33a37c3 [jgitflow-maven-plugin]updating poms for branch'release/1.0.2' with non-snapshot versions adds e6926a7 [jgitflow-maven-plugin]merging 'release/1.0.2' into 'master-1.0.x' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 4 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/config/CoselmarServicesConfig.java | 4 ++ .../config/CoselmarServicesConfigOption.java | 5 ++ coselmar-rest/pom.xml | 2 +- .../HealthBean.java} | 46 +++++++++++-- .../coselmar/services/v1/HealthService.java | 78 ++++++++++++++++++++++ .../i18n/coselmar-services_en_GB.properties | 2 +- .../i18n/coselmar-services_fr_FR.properties | 2 +- coselmar-rest/src/main/resources/mapping | 5 +- coselmar-ui/pom.xml | 2 +- .../notificationTemplate.html => health.html} | 34 +++++++--- .../{coselmar-constants.js => coselmar-health.js} | 18 +++-- pom.xml | 10 ++- 14 files changed, 186 insertions(+), 28 deletions(-) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/{services/errors/NoResultException.java => beans/HealthBean.java} (50%) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java copy coselmar-ui/src/main/webapp/{views/notificationTemplate.html => health.html} (52%) copy coselmar-ui/src/main/webapp/js/{coselmar-constants.js => coselmar-health.js} (65%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.