diff --git a/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java b/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java index d178abb..f07edce 100644 --- a/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java +++ b/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java @@ -4,13 +4,14 @@ import java.util.List; import javax.ejb.Remote; +import org.yacos.core.conferences.Conference; import org.yacos.core.exceptions.PKAlreadyUsedException; @Remote public interface IUserManager { //crud methode - public List getUsers(); + public User addUser(String login, String password, String firstName, String lastName, String organization, String email) throws PKAlreadyUsedException; public void removeUser(User user); @@ -18,8 +19,10 @@ public interface IUserManager { public void UpdateUser(User user); public Boolean exists(String login); - //role methode - public List getRoles(); + // methodes lister + public List getUsers(); + public List getUsers(Conference conf); + public List getUsers(Role.RoleType type); } diff --git a/YACOSCore/ejbModule/org/yacos/core/users/User.java b/YACOSCore/ejbModule/org/yacos/core/users/User.java index 7a041c0..40e4d5d 100644 --- a/YACOSCore/ejbModule/org/yacos/core/users/User.java +++ b/YACOSCore/ejbModule/org/yacos/core/users/User.java @@ -9,6 +9,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; +import org.yacos.core.article.Article; import org.yacos.core.conferences.Conference; @@ -52,12 +53,16 @@ public class User implements Serializable{ * Active email (has to be used frequently) of the user */ private String email; + /** * Roles for this user */ @OneToMany(targetEntity=Role.class,mappedBy="user") private List roles; + @OneToMany(targetEntity=Article.class,mappedBy="mainAuthor") + private List
articles; + public User(String login, String password, String firstName, String lastName, String organization, String email) { this(); @@ -159,5 +164,15 @@ public class User implements Serializable{ public void setRoles(List roles) { this.roles = roles; } + + @OneToMany(targetEntity=Article.class,mappedBy="mainAuthor") + public List
getArticles() { + return articles; + } + + @OneToMany(targetEntity=Article.class,mappedBy="mainAuthor") + public void setArticles(List
articles) { + this.articles = articles; + } }