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 310cf01e356ed292016809cbc0c7e388266f06a7 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Nov 20 14:49:26 2014 +0100 add organization in user --- .gitignore | 3 ++- .../src/main/xmi/coselmar-model.zargo | Bin 5991 -> 6024 bytes .../main/java/fr/ifremer/coselmar/beans/UserBean.java | 12 +++++++++++- .../coselmar/converter/BeanEntityConverter.java | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 62f7843..6b8f51b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,11 +9,12 @@ /*/*.ipr /*.iws /*/*.iws -/*/*~ +/**/*~ /.project /*/.project /.classpath /*/.classpath /.settings /*/.settings +/*/*.zargo~ diff --git a/coselmar-persistence/src/main/xmi/coselmar-model.zargo b/coselmar-persistence/src/main/xmi/coselmar-model.zargo index 0ddcf03..bcd73e2 100644 Binary files a/coselmar-persistence/src/main/xmi/coselmar-model.zargo and b/coselmar-persistence/src/main/xmi/coselmar-model.zargo differ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserBean.java index d53648e..4bc9260 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserBean.java @@ -13,15 +13,17 @@ public class UserBean implements Serializable { protected String mail; protected String role; protected String qualification; + protected String organization; protected String password; - public UserBean(String id, String firstName, String name, String mail, String role, String qualification) { + public UserBean(String id, String firstName, String name, String mail, String role, String qualification, String organization) { this.id = id; this.firstName = firstName; this.name = name; this.mail = mail; this.role = role; this.qualification = qualification; + this.organization = organization; } public String getId() { @@ -72,6 +74,14 @@ public class UserBean implements Serializable { this.qualification = qualification; } + public String getOrganization() { + return organization; + } + + public void setOrganization(String organization) { + this.organization = organization; + } + public String getPassword() { return password; } diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java index d90136e..5475788 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java @@ -55,7 +55,8 @@ public class BeanEntityConverter { user.getName(), user.getMail(), user.getRole().name(), - user.getQualification()); + user.getQualification(), + user.getOrganization()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.