This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 2e468378c44cc40fc6a92e80410ea1d79967f193 Merge: 9f52978 a6e1f56 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Nov 21 11:31:49 2014 +0100 Merge branch 'feature/6012-create-user' into develop .gitignore | 3 +- .../src/main/xmi/coselmar-model.zargo | Bin 5234 -> 6024 bytes coselmar-rest/pom.xml | 59 ++++++ .../coselmar/beans/UserAccountCreatedMail.java | 81 +++++++ .../java/fr/ifremer/coselmar/beans/UserBean.java | 92 ++++++++ .../coselmar/converter/BeanEntityConverter.java | 13 ++ .../services/CoselmarRestApplicationListener.java | 4 +- .../coselmar/services/CoselmarServicesContext.java | 11 +- .../services/CoselmarWebServiceSupport.java | 1 + .../services/DefaultCoselmarServicesContext.java | 67 ++++++ .../services/config/CoselmarServicesConfig.java | 48 ++++- .../config/CoselmarServicesConfigOption.java | 41 +++- .../errors/InvalidCredentialException.java | 11 + .../coselmar/services/v1/UsersWebService.java | 232 +++++++++++++++++++++ .../resources/mail/UserAccountCreatedMail.mustache | 8 + .../mail/UserAccountCreatedMail_fr.mustache | 8 + coselmar-rest/src/main/resources/mapping | 11 +- .../services/AbstractCoselmarWebServiceTest.java | 92 ++++++++ .../services/FakeCoselmarApplicationContext.java | 224 ++++++++++++++++++++ .../services/FakeCoselmarServicesContext.java | 51 +++++ .../coselmar/services/UsersWebServiceTest.java | 59 ++++++ .../src/test/resources/coselmar-test.properties | 33 +++ coselmar-ui/src/main/webapp/index.html | 1 + .../src/main/webapp/js/coselmar-controllers.js | 72 ++++++- .../src/main/webapp/js/coselmar-services.js | 20 +- .../src/main/webapp/js/coselmar-user-services.js | 82 ++++++++ coselmar-ui/src/main/webapp/js/coselmar.js | 23 +- .../webapp/views/{ => documents}/document.html | 0 .../webapp/views/{ => documents}/documents.html | 0 .../webapp/views/{ => documents}/newdocument.html | 0 .../src/main/webapp/views/users/newuser.html | 79 +++++++ coselmar-ui/src/main/webapp/views/users/user.html | 26 +++ coselmar-ui/src/main/webapp/views/users/users.html | 41 ++++ pom.xml | 56 +++++ 34 files changed, 1507 insertions(+), 42 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.