From cc5c1512d2eb084999ceedebf5802cd32d4a111f Mon Sep 17 00:00:00 2001 From: Christian Corsano Date: Wed, 30 Jan 2008 23:12:04 +0000 Subject: [PATCH] Modifications minimes pour faciliter la recuperation des roles sur le core --- .../org/yacos/core/conferences/ConferenceManagerBean.java | 4 +++- .../org/yacos/core/conferences/IConferenceManager.java | 2 +- YACOSCore/ejbModule/org/yacos/core/users/User.java | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java index bf2fa92..3cff72f 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java @@ -98,7 +98,9 @@ public class ConferenceManagerBean implements IConferenceManager { } @SuppressWarnings("unchecked") - public List getRoles(User user, Conference conf) { + public List getRoles(String userLogin, Integer confId) { + User user = em.find(User.class, userLogin); + Conference conf = em.find(Conference.class, confId); Query query = em.createQuery("from Role role where conference = ? and user = ?"); query.setParameter(1, conf); query.setParameter(2, user); diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java index 7e8d14f..7278ed5 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java @@ -33,7 +33,7 @@ public interface IConferenceManager { 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); + public List getRoles(String userLogin, Integer confId); public void updateRole(Role role); public boolean exists(Integer conferenceId); } diff --git a/YACOSCore/ejbModule/org/yacos/core/users/User.java b/YACOSCore/ejbModule/org/yacos/core/users/User.java index 422f94f..1d1f2b5 100644 --- a/YACOSCore/ejbModule/org/yacos/core/users/User.java +++ b/YACOSCore/ejbModule/org/yacos/core/users/User.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import javax.persistence.CascadeType; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity;