diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java index ea1638a..7e8d14f 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java @@ -30,7 +30,7 @@ public interface IConferenceManager { //role et user methode - public void addRole(Role.RoleType roleType, String login, Integer confId); + public Role addRole(Role.RoleType roleType, String login, Integer confId); public void removeRole(Role role); public List getRoles(Conference conf); public List getRoles(User user, Conference conf); diff --git a/YACOSCore/ejbModule/org/yacos/core/users/User.java b/YACOSCore/ejbModule/org/yacos/core/users/User.java index ed68201..40e8a5c 100644 --- a/YACOSCore/ejbModule/org/yacos/core/users/User.java +++ b/YACOSCore/ejbModule/org/yacos/core/users/User.java @@ -4,10 +4,10 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; - +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; - +import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.OneToMany; @@ -60,7 +60,7 @@ public class User implements Serializable{ * Roles for this user */ //@OneToMany(targetEntity=Role.class,mappedBy="user",fetch=FetchType.EAGER,cascade=CascadeType.ALL) - @OneToMany(targetEntity=Role.class,mappedBy="user") + @OneToMany(targetEntity=Role.class,mappedBy="user",cascade=CascadeType.ALL) private List roles; @OneToMany(targetEntity=Article.class,mappedBy="mainAuthor") diff --git a/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java index c3bb616..51771bd 100644 --- a/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java +++ b/YACOSCore/ejbModule/org/yacos/core/users/UserManagerBean.java @@ -74,8 +74,9 @@ public class UserManagerBean implements IUserManager{ } public List getUsers(RoleType type) { - // TODO Auto-generated method stub - return null; + Query query = em.createQuery("from Role role where type = ?"); + query.setParameter(1, type); + return query.getResultList(); } public List getRoles() {