branch develop updated (945bdbd -> 0b7fb90)
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 945bdbd [jgitflow-maven-plugin]updating poms for 0.3-SNAPSHOT development new ac89e0c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 063cf6e [jgitflow-maven-plugin]updating poms for branch'release/0.2' with non-snapshot versions new add715e new version new 466d5e3 Merge branch 'release/0.2' new c968752 Merge branch 'master' into develop new 0b7fb90 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 0b7fb905a6aaad3a789367b17709c2ef2933b06d Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:16:37 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c9687526982c54c90c5a9251db2e77aea1b3c44d Merge: ac89e0c 466d5e3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:16:36 2014 +0000 Merge branch 'master' into develop commit ac89e0c9cbd9e1e2017c7613a3a4efa23c211c41 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:16:36 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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' commit add715eee5c508c6b0b44aee8b334c6d79635922 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:11:55 2014 +0000 new version commit 063cf6e925ed2c1969d8d7bbd3f982adfcef3a2e Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:09:57 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.2' with non-snapshot versions Summary of changes: coselmar-ui/src/main/webapp/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 063cf6e925ed2c1969d8d7bbd3f982adfcef3a2e Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:09:57 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.2' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 63b8389..a83c0c2 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 21faa60..d84d63c 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 65b3b87..fd9f69c 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 7a4c76c..2147344 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index de5501c..ff973f6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 add715eee5c508c6b0b44aee8b334c6d79635922 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:11:55 2014 +0000 new version --- coselmar-ui/src/main/webapp/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coselmar-ui/src/main/webapp/version.txt b/coselmar-ui/src/main/webapp/version.txt index dc92710..2f45361 100644 --- a/coselmar-ui/src/main/webapp/version.txt +++ b/coselmar-ui/src/main/webapp/version.txt @@ -1 +1 @@ -0.2-SNAPSHOT \ No newline at end of file +0.2 \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 ac89e0c9cbd9e1e2017c7613a3a4efa23c211c41 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:16:36 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 00d48e3..a83c0c2 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 33cc3a7..d84d63c 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index e91353f..fd9f69c 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index b1b9b6e..2147344 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 7c7bdca..ff973f6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.3-SNAPSHOT</version> + <version>0.2</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 c9687526982c54c90c5a9251db2e77aea1b3c44d Merge: ac89e0c 466d5e3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:16:36 2014 +0000 Merge branch 'master' into develop coselmar-ui/src/main/webapp/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 0b7fb905a6aaad3a789367b17709c2ef2933b06d Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 27 16:16:37 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index a83c0c2..00d48e3 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d84d63c..33cc3a7 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index fd9f69c..e91353f 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 2147344..b1b9b6e 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index ff973f6..7c7bdca 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.2</version> + <version>0.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm