This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See http://git.codelutin.com/coselmar.git from eecacb6 Merge branch 'release/0.1.1' adds 7c08712 prepare User Service adds bf4d364 prepare user ui adds 3b099c5 prepare User Service adds c11b794 Merge branch 'feature/6012-create-user' of https://git.codelutin.com/coselmar into feature/6012-create-user adds 8575bb0 prepare users javascript services adds 077f21d prepare user account creation and login operrations adds 0eaf8f5 prepare user account creation and login operrations adds bc986fa prepare mail support adds 310cf01 add organization in user adds a6e1f56 finish user creation, add login method adds 2e46837 Merge branch 'feature/6012-create-user' into develop adds 9847e3e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 45c1bf0 Merge branch 'master' into develop adds 62e996a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 984fbd9 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds cf69dca Add two default users in applications Fix mail support on user account creation adds 25a3939 fixes #6122 add footer adds b65a15c Add Login logic in UI adds b6a809a Fix way to pass login/password during login Add constant as config for services URL adds b837a81 #6014 add service for modify user & some authorization management adds c8a14d8 #6014 add way to modify user (as admin and as user for its own account) in UI adds 166496f Merge branch 'feature/6014-modify-user' into develop adds cf38c8d #6140 add new metadata in document entity adds 1c77d64 #6140 manager document metadata in webservice adds 673e11b #6140 add new metadata in document views adds 3c42708 Merge branch 'feature/6140-update-document-metadata' into develop adds 81fb833 #6142 #6143 only Admin, supervisor, expert (public) or admin, supervisor, owner can view and delete document adds 5e32997 #6142 Filter documents list according to privacy and userRole adds 3679385 Merge branch 'feature/6142-filter-documents-list' into develop adds b411b4d #6015 User deletion is not a real deletion : user become non active adds 9ba6c66 Add search by keyword and filter on active in users list Fix Document search adds c58cf53 fix documents list adds 99d089c prepare before release adds 063cf6e [jgitflow-maven-plugin]updating poms for branch'release/0.2' with non-snapshot versions adds add715e new version adds 466d5e3 Merge branch 'release/0.2' No new revisions were added by this update. Summary of changes: .gitignore | 3 +- coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 15 +- 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 +- .../InvalidCredentialException.java} | 10 +- .../UnauthorizedException.java} | 10 +- .../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 ++++ .../resources/coselmar-test.properties} | 2 + 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 | 15 +- .../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 ++++++ .../{WEB-INF/web.xml => views/users/newuser.html} | 25 +- .../views/{document.html => users/user.html} | 39 +- .../views/{documents.html => users/users.html} | 38 +- pom.xml | 74 +++- 59 files changed, 3496 insertions(+), 339 deletions(-) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarService.java => coselmar-bundle/src/main/webapp/js/coselmar-constants.js (77%) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/DaoUtils.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java 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/beans/UserWebToken.java copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/{CoselmarRestRequestContext.java => CoselmarSimpleServiceSupport.java} (57%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/{CoselmarService.java => errors/InvalidCredentialException.java} (77%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/{CoselmarService.java => errors/UnauthorizedException.java} (78%) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/InitialisationService.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java create mode 100644 coselmar-rest/src/main/resources/i18n/coselmar-services_en_GB.properties create mode 100644 coselmar-rest/src/main/resources/i18n/coselmar-services_fr_FR.properties 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/version.txt copy coselmar-ui/src/main/webapp/{js/coselmar.js => css/coselmar.css} (52%) create mode 100644 coselmar-ui/src/main/webapp/js/angular-jwt.js copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarService.java => coselmar-ui/src/main/webapp/js/coselmar-constants.js (77%) create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-user-services.js create mode 100644 coselmar-ui/src/main/webapp/version.txt copy coselmar-ui/src/main/webapp/views/{ => documents}/document.html (61%) copy coselmar-ui/src/main/webapp/views/{ => documents}/documents.html (88%) create mode 100644 coselmar-ui/src/main/webapp/views/documents/newdocument.html delete mode 100644 coselmar-ui/src/main/webapp/views/newdocument.html create mode 100644 coselmar-ui/src/main/webapp/views/users/edituser.html copy coselmar-ui/src/main/webapp/{WEB-INF/web.xml => views/users/newuser.html} (53%) rename coselmar-ui/src/main/webapp/views/{document.html => users/user.html} (58%) rename coselmar-ui/src/main/webapp/views/{documents.html => users/users.html} (56%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.