November 2014 - Coselmar-commits - mailman.cloud.codelutin.com

branch develop updated (b411b4d -> 9ba6c66)
by codelutin.com scm 27 Nov '14

27 Nov '14

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 b411b4d #6015 User deletion is not a real deletion : user become non active new 9ba6c66 Add search by keyword and filter on active in users list Fix Document search The 1 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 9ba6c666d063cdd8f476cf1f2b2aacd0ce2200bf Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Nov 27 15:33:01 2014 +0100 Add search by keyword and filter on active in users list Fix Document search Summary of changes: .../fr/ifremer/coselmar/persistence/DaoUtils.java | 2 +- .../persistence/entity/CoselmarUserTopiaDao.java | 75 ++++++++++++++++++++++ .../persistence/entity/DocumentTopiaDao.java | 8 ++- .../coselmar/services/v1/UsersWebService.java | 17 +++-- .../src/main/webapp/js/coselmar-controllers.js | 14 ++-- .../src/main/webapp/js/coselmar-user-services.js | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 9 ++- 7 files changed, 110 insertions(+), 17 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (3679385 -> b411b4d)
by codelutin.com scm 27 Nov '14

27 Nov '14

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 3679385 Merge branch 'feature/6142-filter-documents-list' into develop new b411b4d #6015 User deletion is not a real deletion : user become non active The 1 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 b411b4df246b2d55f2743ba64eee192aff120230 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Nov 27 11:53:32 2014 +0100 #6015 User deletion is not a real deletion : user become non active Summary of changes: .../src/main/xmi/coselmar-model.zargo | Bin 6490 -> 6557 bytes .../main/java/fr/ifremer/coselmar/beans/UserBean.java | 12 +++++++++++- .../coselmar/converter/BeanEntityConverter.java | 3 ++- .../ifremer/coselmar/services/v1/UsersWebService.java | 7 +++++-- coselmar-ui/src/main/webapp/views/users/user.html | 9 +++++++-- coselmar-ui/src/main/webapp/views/users/users.html | 3 +++ 6 files changed, 28 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (3c42708 -> 3679385)
by codelutin.com scm 27 Nov '14

27 Nov '14

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 3c42708 Merge branch 'feature/6140-update-document-metadata' into develop new 81fb833 #6142 #6143 only Admin, supervisor, expert (public) or admin, supervisor, owner can view and delete document new 5e32997 #6142 Filter documents list according to privacy and userRole new 3679385 Merge branch 'feature/6142-filter-documents-list' into develop The 3 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 367938536e53cb2214d902a529a88dd53ea325ba Merge: 3c42708 5e32997 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Nov 27 11:11:37 2014 +0100 Merge branch 'feature/6142-filter-documents-list' into develop commit 5e3299722403c4f027fde642d99e9204dceedc5e Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Nov 27 11:11:18 2014 +0100 #6142 Filter documents list according to privacy and userRole commit 81fb833326127ce16207d00d786e7f29e63a2934 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Nov 26 18:18:51 2014 +0100 #6142 #6143 only Admin, supervisor, expert (public) or admin, supervisor, owner can view and delete document Summary of changes: .../fr/ifremer/coselmar/persistence/DaoUtils.java | 112 ++++++++++++++ .../persistence/entity/DocumentTopiaDao.java | 32 ++++ .../services/CoselmarWebServiceSupport.java | 13 ++ .../coselmar/services/v1/DocumentsWebService.java | 162 ++++++++++++++++++--- coselmar-ui/src/main/webapp/index.html | 8 +- .../src/main/webapp/js/coselmar-controllers.js | 2 +- .../src/main/webapp/views/documents/documents.html | 2 +- .../main/webapp/views/documents/newdocument.html | 17 ++- 8 files changed, 311 insertions(+), 37 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/DaoUtils.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (166496f -> 3c42708)
by codelutin.com scm 26 Nov '14

26 Nov '14

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 166496f Merge branch 'feature/6014-modify-user' into develop new cf38c8d #6140 add new metadata in document entity new 1c77d64 #6140 manager document metadata in webservice new 673e11b #6140 add new metadata in document views new 3c42708 Merge branch 'feature/6140-update-document-metadata' into develop The 4 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 3c427089cc3e372a8036f43489eee22f2b79db8a Merge: 166496f 673e11b Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Nov 26 16:55:42 2014 +0100 Merge branch 'feature/6140-update-document-metadata' into develop commit 673e11b82b16207ef885f3bbb611391d7cbbf532 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Nov 26 16:53:30 2014 +0100 #6140 add new metadata in document views commit 1c77d64152f9b87c42155ddd19830b726bb56d38 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Nov 26 11:23:09 2014 +0100 #6140 manager document metadata in webservice commit cf38c8d9b10d0ffce7853b414efd46dcb7e9fd40 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Nov 26 10:17:13 2014 +0100 #6140 add new metadata in document entity Summary of changes: .../src/main/xmi/coselmar-model.properties | 5 +- .../src/main/xmi/coselmar-model.zargo | Bin 6029 -> 6490 bytes .../fr/ifremer/coselmar/beans/DocumentBean.java | 127 +++++++++++++++- .../coselmar/converter/BeanEntityConverter.java | 40 +++-- .../coselmar/services/v1/DocumentsWebService.java | 162 +++++++++++++++++---- .../coselmar/services/v1/UsersWebService.java | 7 +- .../src/main/webapp/js/coselmar-controllers.js | 23 ++- .../src/main/webapp/js/coselmar-services.js | 11 +- .../src/main/webapp/views/documents/document.html | 34 ++++- .../src/main/webapp/views/documents/documents.html | 6 +- .../main/webapp/views/documents/newdocument.html | 105 +++++++++++-- 11 files changed, 447 insertions(+), 73 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (b6a809a -> 166496f)
by codelutin.com scm 25 Nov '14

25 Nov '14

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 b6a809a Fix way to pass login/password during login Add constant as config for services URL new b837a81 #6014 add service for modify user & some authorization management new c8a14d8 #6014 add way to modify user (as admin and as user for its own account) in UI new 166496f Merge branch 'feature/6014-modify-user' into develop The 3 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 166496f3b3eb0da9174658847cf5e4f4571a9e35 Merge: b6a809a c8a14d8 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Nov 25 17:59:52 2014 +0100 Merge branch 'feature/6014-modify-user' into develop commit c8a14d839be2ed6d81bbbc07634e89fe940616a0 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Nov 25 17:59:30 2014 +0100 #6014 add way to modify user (as admin and as user for its own account) in UI commit b837a8107a542acdb709c6a7d3326777f8dd7ebd Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Nov 25 11:48:43 2014 +0100 #6014 add service for modify user & some authorization management Summary of changes: .../java/fr/ifremer/coselmar/beans/UserBean.java | 9 + .../fr/ifremer/coselmar/beans/UserWebToken.java | 88 ++++++++++ .../services/CoselmarWebServiceSupport.java | 41 +++++ ...alException.java => UnauthorizedException.java} | 4 +- .../coselmar/services/v1/UsersWebService.java | 194 +++++++++++++++++++-- coselmar-rest/src/main/resources/mapping | 3 +- coselmar-ui/src/main/webapp/index.html | 4 +- .../src/main/webapp/js/coselmar-controllers.js | 30 +++- .../src/main/webapp/js/coselmar-user-services.js | 26 ++- coselmar-ui/src/main/webapp/js/coselmar.js | 2 +- .../src/main/webapp/views/users/edituser.html | 94 ++++++++++ .../src/main/webapp/views/users/newuser.html | 61 +------ coselmar-ui/src/main/webapp/views/users/user.html | 14 +- coselmar-ui/src/main/webapp/views/users/users.html | 6 +- 14 files changed, 485 insertions(+), 91 deletions(-) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserWebToken.java copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/{InvalidCredentialException.java => UnauthorizedException.java} (52%) create mode 100644 coselmar-ui/src/main/webapp/views/users/edituser.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (25a3939 -> b6a809a)
by codelutin.com scm 24 Nov '14

24 Nov '14

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 25a3939 fixes #6122 add footer new b65a15c Add Login logic in UI new b6a809a Fix way to pass login/password during login Add constant as config for services URL The 2 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 b6a809a8ee3398da60ebd7d83d8fcc9a33cabc7c Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Nov 24 17:42:35 2014 +0100 Fix way to pass login/password during login Add constant as config for services URL commit b65a15c6efb0393b18cfe28f7bbcad6d73be0c7a Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Nov 24 15:50:27 2014 +0100 Add Login logic in UI Summary of changes: .../src/main/webapp/js/coselmar-constants.js | 3 + coselmar-rest/src/main/resources/mapping | 2 +- .../coselmar/services/UsersWebServiceTest.java | 2 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/index.html | 55 +++++++--- coselmar-ui/src/main/webapp/js/angular-jwt.js | 119 +++++++++++++++++++++ .../src/main/webapp/js/coselmar-constants.js | 3 + .../src/main/webapp/js/coselmar-controllers.js | 37 ++++++- .../src/main/webapp/js/coselmar-services.js | 9 +- .../src/main/webapp/js/coselmar-user-services.js | 26 ++++- coselmar-ui/src/main/webapp/js/coselmar.js | 10 +- 11 files changed, 235 insertions(+), 33 deletions(-) create mode 100644 coselmar-bundle/src/main/webapp/js/coselmar-constants.js create mode 100644 coselmar-ui/src/main/webapp/js/angular-jwt.js create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-constants.js -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (cf69dca -> 25a3939)
by codelutin.com scm 21 Nov '14

21 Nov '14

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 cf69dca Add two default users in applications Fix mail support on user account creation new 25a3939 fixes #6122 add footer The 1 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 25a3939bcc1d63c9485042dc3e66484dce02dc2e Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Nov 21 17:36:32 2014 +0100 fixes #6122 add footer Summary of changes: coselmar-ui/pom.xml | 23 +++++++++++ coselmar-ui/src/main/version.txt | 1 + coselmar-ui/src/main/webapp/css/coselmar.css | 47 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/index.html | 24 ++++++++++- .../src/main/webapp/js/coselmar-controllers.js | 9 ++++- .../src/main/webapp/js/coselmar-services.js | 18 ++++----- .../src/main/webapp/js/coselmar-user-services.js | 5 ++- coselmar-ui/src/main/webapp/version.txt | 1 + 8 files changed, 113 insertions(+), 15 deletions(-) create mode 100644 coselmar-ui/src/main/version.txt create mode 100644 coselmar-ui/src/main/webapp/css/coselmar.css create mode 100644 coselmar-ui/src/main/webapp/version.txt -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (984fbd9 -> cf69dca)
by codelutin.com scm 21 Nov '14

21 Nov '14

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 984fbd9 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new cf69dca Add two default users in applications Fix mail support on user account creation The 1 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 cf69dca56579074d6e26eb5e33c1e02d58217018 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Nov 21 16:22:10 2014 +0100 Add two default users in applications Fix mail support on user account creation Summary of changes: .../src/main/xmi/coselmar-model.zargo | Bin 6024 -> 6029 bytes .../coselmar/beans/UserAccountCreatedMail.java | 4 +- .../coselmar/converter/BeanEntityConverter.java | 6 +-- .../services/CoselmarRestRequestContext.java | 4 +- .../CoselmarServicesApplicationContext.java | 8 ++++ .../services/CoselmarSimpleServiceSupport.java | 40 ++++++++++++++++ .../services/CoselmarWebServiceSupport.java | 6 +-- .../services/v1/InitialisationService.java | 52 +++++++++++++++++++++ .../coselmar/services/v1/UsersWebService.java | 27 ++++++----- .../i18n/coselmar-services_en_GB.properties | 1 + .../i18n/coselmar-services_fr_FR.properties | 1 + .../resources/mail/UserAccountCreatedMail.mustache | 2 +- .../mail/UserAccountCreatedMail_fr.mustache | 2 +- 13 files changed, 127 insertions(+), 26 deletions(-) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarSimpleServiceSupport.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/InitialisationService.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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6012-create-user updated (3b099c5 -> a6e1f56)
by codelutin.com scm 21 Nov '14

21 Nov '14

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(a)codelutin.com>.

1 0

branch develop updated (62e996a -> 984fbd9)
by codelutin.com scm 21 Nov '14

21 Nov '14

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(a)xn--odelutin-tka.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(a)xn--odelutin-tka.com> Date: Fri Nov 21 11:31:49 2014 +0100 Merge branch 'feature/6012-create-user' into develop commit a6e1f56d663bf878bd9fb49f7995227233f1ff6d Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Fri Nov 21 11:13:21 2014 +0100 finish user creation, add login method commit 310cf01e356ed292016809cbc0c7e388266f06a7 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Thu Nov 20 14:49:26 2014 +0100 add organization in user commit bc986faef0b94cd4c224056157bdc160875f1f19 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Wed Nov 19 11:21:40 2014 +0100 prepare mail support commit 0eaf8f5e894f766dc6e4cafd35efe526321ad447 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Nov 18 18:13:26 2014 +0100 prepare user account creation and login operrations commit 077f21d986c2ad2fac97f141d797a231e660db39 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Tue Nov 18 18:12:59 2014 +0100 prepare user account creation and login operrations commit 8575bb0b19cb411f8776f117bd57184a99dc2c64 Author: Yannick Martel <martel(a)xn--odelutin-tka.com> Date: Mon Nov 17 20:20:02 2014 +0100 prepare users javascript services commit c11b794476da8699ab425796e7143e7d34ebeb62 Merge: bf4d364 3b099c5 Author: Yannick Martel <martel(a)xn--odelutin-tka.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(a)xn--odelutin-tka.com> Date: Fri Nov 14 18:31:18 2014 +0100 prepare user ui commit 7c08712382b5cd402602f37cf425e27191f533b9 Author: Yannick Martel <martel(a)xn--odelutin-tka.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(a)codelutin.com>.

1 11