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 466d5e396457f597fede91011ca5359ac110312e Merge: eecacb6 add715e Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:16:35 2014 +0000 Merge branch 'release/0.2' .gitignore | 3 +- coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 23 +- coselmar-persistence/pom.xml | 2 +- .../fr/ifremer/coselmar/persistence/DaoUtils.java | 136 +++++++ .../persistence/entity/CoselmarUserTopiaDao.java | 99 +++++ .../persistence/entity/DocumentTopiaDao.java | 34 ++ .../src/main/xmi/coselmar-model.properties | 5 +- .../src/main/xmi/coselmar-model.zargo | Bin 5234 -> 6557 bytes coselmar-rest/pom.xml | 75 +++- .../fr/ifremer/coselmar/beans/DocumentBean.java | 127 +++++- .../coselmar/beans/UserAccountCreatedMail.java | 105 +++++ .../java/fr/ifremer/coselmar/beans/UserBean.java | 135 +++++++ .../fr/ifremer/coselmar/beans/UserWebToken.java | 112 ++++++ .../coselmar/converter/BeanEntityConverter.java | 48 ++- .../services/CoselmarRestApplicationListener.java | 4 +- .../services/CoselmarRestRequestContext.java | 4 +- .../CoselmarServicesApplicationContext.java | 8 + .../coselmar/services/CoselmarServicesContext.java | 11 +- ...text.java => CoselmarSimpleServiceSupport.java} | 36 +- .../services/CoselmarWebServiceSupport.java | 61 ++- .../services/DefaultCoselmarServicesContext.java | 67 ++++ .../services/config/CoselmarServicesConfig.java | 48 ++- .../config/CoselmarServicesConfigOption.java | 41 +- .../errors/InvalidCredentialException.java | 24 +- .../services/errors/UnauthorizedException.java | 24 +- .../coselmar/services/v1/DocumentsWebService.java | 306 ++++++++++++--- .../services/v1/InitialisationService.java | 76 ++++ .../coselmar/services/v1/UsersWebService.java | 426 +++++++++++++++++++++ .../i18n/coselmar-services_en_GB.properties | 1 + .../i18n/coselmar-services_fr_FR.properties | 1 + .../resources/mail/UserAccountCreatedMail.mustache | 8 + .../mail/UserAccountCreatedMail_fr.mustache | 8 + coselmar-rest/src/main/resources/mapping | 12 +- .../services/AbstractCoselmarWebServiceTest.java | 116 ++++++ .../services/FakeCoselmarApplicationContext.java | 248 ++++++++++++ .../services/FakeCoselmarServicesContext.java | 75 ++++ .../coselmar/services/UsersWebServiceTest.java | 83 ++++ .../src/test/resources/coselmar-test.properties | 14 +- coselmar-ui/pom.xml | 27 +- coselmar-ui/src/main/version.txt | 1 + .../webapp/{js/coselmar.js => css/coselmar.css} | 59 ++- coselmar-ui/src/main/webapp/index.html | 78 +++- coselmar-ui/src/main/webapp/js/angular-jwt.js | 142 +++++++ .../src/main/webapp/js/coselmar-constants.js | 23 +- .../src/main/webapp/js/coselmar-controllers.js | 169 +++++++- .../src/main/webapp/js/coselmar-services.js | 34 +- .../src/main/webapp/js/coselmar-user-services.js | 121 ++++++ coselmar-ui/src/main/webapp/js/coselmar.js | 33 +- coselmar-ui/src/main/webapp/version.txt | 1 + .../webapp/views/{ => documents}/document.html | 34 +- .../webapp/views/{ => documents}/documents.html | 8 +- .../main/webapp/views/documents/newdocument.html | 172 +++++++++ coselmar-ui/src/main/webapp/views/newdocument.html | 88 ----- .../src/main/webapp/views/users/edituser.html | 117 ++++++ .../src/main/webapp/views/users/newuser.html | 43 +++ .../views/{document.html => users/user.html} | 39 +- .../views/{documents.html => users/users.html} | 38 +- pom.xml | 74 +++- 59 files changed, 3536 insertions(+), 373 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.