branch feature/6012-create-user updated (3b099c5 -> a6e1f56)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6012-create-user in repository coselmar. See http://git.codelutin.com/coselmar.git from 3b099c5 prepare User Service adds d4ea4a8 add profile for demo deploy adds 7376a8f fix style on documents list adds e99f28b fill home page adds beb4ba2 [jgitflow-maven-plugin]updating poms for 0.2-SNAPSHOT development adds b2071f8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 044fc84 [jgitflow-maven-plugin]updating poms for branch '0.1' with snapshot versions adds 4b8d807 fix for release 0.1 adds 9133464 [jgitflow-maven-plugin]updating poms for branch'release/0.1' with non-snapshot versions adds f49c339 fix distributionManagement adds 9be211a fix profile adds cd2ff95 Merge branch 'release/0.1' adds f7434b4 Merge master in develop adds 1d27a06 fix poms adds 37e5d3c fix nuiton-js dependency... adds 7c08712 prepare User Service adds bf4d364 prepare user ui 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 No new revisions were added by this update. Summary of changes: .gitignore | 3 +- coselmar-bundle/pom.xml | 43 +++- coselmar-bundle/src/license/THIRD-PARTY.properties | 28 +++ coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 24 +++ coselmar-persistence/pom.xml | 61 +++--- .../src/license/THIRD-PARTY.properties | 29 +++ .../persistence/CoselmarPersistenceContext.java | 24 +++ .../persistence/entity/DocumentTopiaDao.java | 24 +++ .../src/main/xmi/coselmar-model.properties | 23 ++ .../src/main/xmi/coselmar-model.zargo | Bin 5991 -> 6024 bytes coselmar-rest/pom.xml | 98 +++++++-- coselmar-rest/src/license/THIRD-PARTY.properties | 41 ++++ .../fr/ifremer/coselmar/beans/DocumentBean.java | 24 +++ .../coselmar/beans/UserAccountCreatedMail.java | 81 +++++++ .../java/fr/ifremer/coselmar/beans/UserBean.java | 21 +- .../coselmar/converter/BeanEntityConverter.java | 27 ++- .../ifremer/coselmar/converter/DateConverter.java | 24 +++ .../coselmar/converter/JsonArrayConverter.java | 24 +++ .../ifremer/coselmar/converter/JsonConverter.java | 24 +++ .../fr/ifremer/coselmar/converter/JsonHelper.java | 24 +++ .../services/CoselmarApplicationContext.java | 24 +++ .../ifremer/coselmar/services/CoselmarRender.java | 24 +++ .../services/CoselmarRestApplicationListener.java | 28 ++- .../services/CoselmarRestRequestContext.java | 24 +++ .../coselmar/services/CoselmarRestUtil.java | 24 +++ .../ifremer/coselmar/services/CoselmarService.java | 24 +++ .../CoselmarServicesApplicationContext.java | 24 +++ .../coselmar/services/CoselmarServicesContext.java | 35 +++- .../services/CoselmarTechnicalException.java | 24 +++ .../services/CoselmarWebServiceSupport.java | 25 +++ .../services/DefaultCoselmarServicesContext.java | 91 ++++++++ .../services/config/CoselmarServicesConfig.java | 72 ++++++- .../config/CoselmarServicesConfigOption.java | 65 +++++- .../errors/InvalidCredentialException.java | 11 + .../services/filter/CoselmarRestRequestFilter.java | 24 +++ .../filter/CoselmarTopiaTransactionFilter.java | 24 +++ .../CoselmarRestRequestContextInjector.java | 24 +++ .../injector/CoselmarServicesInjector.java | 24 +++ .../coselmar/services/v1/DocumentsWebService.java | 24 +++ .../ifremer/coselmar/services/v1/ErrorAction.java | 24 +++ .../coselmar/services/v1/UserWebService.java | 85 -------- .../coselmar/services/v1/UsersWebService.java | 232 +++++++++++++++++++++ .../main/resources/coselmar-services.properties | 23 ++ coselmar-rest/src/main/resources/log4j.properties | 23 ++ .../resources/mail/UserAccountCreatedMail.mustache | 8 + .../mail/UserAccountCreatedMail_fr.mustache | 8 + coselmar-rest/src/main/resources/mapping | 11 +- coselmar-rest/src/main/webapp/WEB-INF/web.xml | 24 +++ .../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/pom.xml | 35 +++- coselmar-ui/src/main/webapp/WEB-INF/web.xml | 24 +++ coselmar-ui/src/main/webapp/index.html | 24 +++ .../src/main/webapp/js/coselmar-controllers.js | 95 ++++++++- .../src/main/webapp/js/coselmar-services.js | 43 +++- .../src/main/webapp/js/coselmar-user-services.js | 82 ++++++++ coselmar-ui/src/main/webapp/js/coselmar.js | 46 +++- .../webapp/views/{ => documents}/document.html | 23 ++ .../webapp/views/{ => documents}/documents.html | 24 +++ .../webapp/views/{ => documents}/newdocument.html | 23 ++ coselmar-ui/src/main/webapp/views/home.html | 48 ++++- .../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 | 177 +++++++--------- 68 files changed, 2662 insertions(+), 287 deletions(-) create mode 100644 coselmar-bundle/src/license/THIRD-PARTY.properties create mode 100644 coselmar-persistence/src/license/THIRD-PARTY.properties create mode 100644 coselmar-rest/src/license/THIRD-PARTY.properties 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/services/errors/InvalidCredentialException.java delete mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UserWebService.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 create mode 100644 coselmar-rest/src/test/resources/coselmar-test.properties create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-user-services.js rename coselmar-ui/src/main/webapp/views/{ => documents}/document.html (56%) rename coselmar-ui/src/main/webapp/views/{ => documents}/documents.html (63%) rename coselmar-ui/src/main/webapp/views/{ => documents}/newdocument.html (76%) 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>.
participants (1)
-
codelutin.com scm