branch develop updated (0b7fb90 -> d7437ca)
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 0b7fb90 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new d7437ca fixes #6193 : make initial users 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 d7437ca6a6557aba7de3158c2f989b45efc8c19f Author: Yannick Martel <martel@©odelutin.com> Date: Thu Nov 27 18:03:33 2014 +0100 fixes #6193 : make initial users active Summary of changes: .../java/fr/ifremer/coselmar/services/v1/InitialisationService.java | 2 ++ coselmar-ui/src/main/webapp/version.txt | 2 +- 2 files changed, 3 insertions(+), 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 d7437ca6a6557aba7de3158c2f989b45efc8c19f Author: Yannick Martel <martel@©odelutin.com> Date: Thu Nov 27 18:03:33 2014 +0100 fixes #6193 : make initial users active --- .../java/fr/ifremer/coselmar/services/v1/InitialisationService.java | 2 ++ coselmar-ui/src/main/webapp/version.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/InitialisationService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/InitialisationService.java index 0c66691..ec95685 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/InitialisationService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/InitialisationService.java @@ -48,6 +48,7 @@ public class InitialisationService extends CoselmarSimpleServiceSupport { admin.setMail("admin@temporary.coselmar"); admin.setOrganization("Coselmar"); admin.setRole(CoselmarUserRole.ADMIN); + admin.setActive(true); String salt = servicesContext.generateSalt(); String encodedPassword = servicesContext.encodePassword(salt, "manager1234"); @@ -62,6 +63,7 @@ public class InitialisationService extends CoselmarSimpleServiceSupport { user.setName("Expert"); user.setMail("lambda.expert@temporary.coselmar"); user.setRole(CoselmarUserRole.EXPERT); + user.setActive(true); String lambdaSalt = servicesContext.generateSalt(); String lambdaPassword = servicesContext.encodePassword(lambdaSalt, "manager1234"); diff --git a/coselmar-ui/src/main/webapp/version.txt b/coselmar-ui/src/main/webapp/version.txt index 2f45361..3f82886 100644 --- a/coselmar-ui/src/main/webapp/version.txt +++ b/coselmar-ui/src/main/webapp/version.txt @@ -1 +1 @@ -0.2 \ No newline at end of file +0.3-SNAPSHOT \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm