This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 62e996a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7c08712 prepare User Service new bf4d364 prepare user ui adds 3b099c5 prepare User Service new c11b794 Merge branch 'feature/6012-create-user' of https://git.codelutin.com/coselmar into feature/6012-create-user new 8575bb0 prepare users javascript services new 077f21d prepare user account creation and login operrations new 0eaf8f5 prepare user account creation and login operrations new bc986fa prepare mail support new 310cf01 add organization in user new a6e1f56 finish user creation, add login method new 2e46837 Merge branch 'feature/6012-create-user' into develop new 984fbd9 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 11 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 984fbd9d0062e2a83dfea0a7ed23a3d841ed55de Merge: 2e46837 62e996a Author: Yannick Martel <martel@©odelutin.com> Date: Fri Nov 21 11:32:43 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop 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 commit a6e1f56d663bf878bd9fb49f7995227233f1ff6d Author: Yannick Martel <martel@©odelutin.com> Date: Fri Nov 21 11:13:21 2014 +0100 finish user creation, add login method commit 310cf01e356ed292016809cbc0c7e388266f06a7 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Nov 20 14:49:26 2014 +0100 add organization in user commit bc986faef0b94cd4c224056157bdc160875f1f19 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Nov 19 11:21:40 2014 +0100 prepare mail support commit 0eaf8f5e894f766dc6e4cafd35efe526321ad447 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Nov 18 18:13:26 2014 +0100 prepare user account creation and login operrations commit 077f21d986c2ad2fac97f141d797a231e660db39 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Nov 18 18:12:59 2014 +0100 prepare user account creation and login operrations commit 8575bb0b19cb411f8776f117bd57184a99dc2c64 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Nov 17 20:20:02 2014 +0100 prepare users javascript services commit c11b794476da8699ab425796e7143e7d34ebeb62 Merge: bf4d364 3b099c5 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Nov 17 18:28:38 2014 +0100 Merge branch 'feature/6012-create-user' of https://git.codelutin.com/coselmar into feature/6012-create-user commit bf4d364dd5d24e3beb4292101a02af059e9d5b47 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Nov 14 18:31:18 2014 +0100 prepare user ui commit 7c08712382b5cd402602f37cf425e27191f533b9 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Nov 10 17:50:19 2014 +0100 prepare User Service Summary of changes: .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 ++++++ .../resources/coselmar-test.properties} | 2 + 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, 1476 insertions(+), 42 deletions(-) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserAccountCreatedMail.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserBean.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/InvalidCredentialException.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java create mode 100644 coselmar-rest/src/main/resources/mail/UserAccountCreatedMail.mustache create mode 100644 coselmar-rest/src/main/resources/mail/UserAccountCreatedMail_fr.mustache create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/AbstractCoselmarWebServiceTest.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarServicesContext.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/UsersWebServiceTest.java copy coselmar-rest/src/{main/resources/coselmar-services.properties => test/resources/coselmar-test.properties} (97%) create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-user-services.js rename coselmar-ui/src/main/webapp/views/{ => documents}/document.html (100%) rename coselmar-ui/src/main/webapp/views/{ => documents}/documents.html (100%) rename coselmar-ui/src/main/webapp/views/{ => documents}/newdocument.html (100%) create mode 100644 coselmar-ui/src/main/webapp/views/users/newuser.html create mode 100644 coselmar-ui/src/main/webapp/views/users/user.html create mode 100644 coselmar-ui/src/main/webapp/views/users/users.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.