diff --git a/YACOSWeb/src/org/yacos/auth/UserDetails.java b/YACOSWeb/src/org/yacos/auth/UserDetails.java index f689f91..e572ee9 100644 --- a/YACOSWeb/src/org/yacos/auth/UserDetails.java +++ b/YACOSWeb/src/org/yacos/auth/UserDetails.java @@ -1,6 +1,7 @@ package org.yacos.auth; import java.util.List; + import org.acegisecurity.GrantedAuthority; import org.acegisecurity.GrantedAuthorityImpl; import org.yacos.core.users.Role; diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java index dff940d..bcb3365 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java @@ -2,18 +2,23 @@ package org.yacos.web.PCmember.controller; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.validation.BindException; - import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.view.RedirectView; -import org.yacos.core.article.*; +import org.yacos.core.article.Article; +import org.yacos.core.article.IArticleManager; +import org.yacos.core.article.Preference; import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.users.IUserManager; import org.yacos.core.users.User; diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java index c825363..a45b4a6 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceControllerOK.java @@ -1,14 +1,15 @@ package org.yacos.web.PCmember.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; public class ChoosePreferenceControllerOK extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/CreateReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/CreateReportController.java index 1e9f921..007fd5c 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/CreateReportController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/CreateReportController.java @@ -1,6 +1,7 @@ package org.yacos.web.PCmember.controller; import java.io.IOException; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java index 8082c59..9acd288 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java @@ -2,8 +2,10 @@ package org.yacos.web.PCmember.controller; import java.util.ArrayList; import java.util.Collection; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.validation.BindException; diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java index caed138..752b9c4 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java @@ -2,16 +2,20 @@ package org.yacos.web.PCmember.controller; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.validation.BindException; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.view.RedirectView; -import org.yacos.core.article.*; +import org.yacos.core.article.Article; +import org.yacos.core.article.IArticleManager; import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.evaluation.Criterion; @@ -20,10 +24,7 @@ import org.yacos.core.evaluation.Rating; import org.yacos.core.evaluation.Report; import org.yacos.core.users.IUserManager; import org.yacos.core.users.User; - -//import org.yacos.web.author.form.*; import org.yacos.web.PCmember.form.FormEvaluation; - import org.yacos.web.PCmember.form.SimpleCriterion; import org.yacos.web.system.session.SessionService; diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java index a3ba86f..b44c853 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListArticleController.java @@ -1,20 +1,21 @@ package org.yacos.web.PCmember.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; +import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; -import java.util.List; -import org.yacos.web.system.controller.NoConferenceSelectedException; -import org.yacos.web.system.session.SessionService; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; import org.yacos.core.exceptions.ConferenceDoesntExistException; +import org.yacos.web.system.controller.NoConferenceSelectedException; +import org.yacos.web.system.session.SessionService; public class ListArticleController extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java index feb7aa7..6cca709 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java @@ -1,20 +1,21 @@ package org.yacos.web.PCmember.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; +import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; -import java.util.List; -import org.yacos.web.system.controller.NoConferenceSelectedException; -import org.yacos.web.system.session.SessionService; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; import org.yacos.core.exceptions.ConferenceDoesntExistException; +import org.yacos.web.system.controller.NoConferenceSelectedException; +import org.yacos.web.system.session.SessionService; public class ListEvaluationController extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java index f8e599e..4919627 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ListReportController.java @@ -1,18 +1,20 @@ package org.yacos.web.PCmember.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; +import java.util.List; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; -import java.util.List; -import org.yacos.web.system.controller.NoConferenceSelectedException; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.evaluation.IEvaluationManager; import org.yacos.core.evaluation.Rating; import org.yacos.core.evaluation.Report; +import org.yacos.web.system.controller.NoConferenceSelectedException; public class ListReportController extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java index c19913c..6178298 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValidateArticleController.java @@ -1,17 +1,19 @@ package org.yacos.web.PCmember.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; +import java.util.List; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; -import java.util.List; -import org.yacos.web.system.session.SessionService; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; import org.yacos.core.exceptions.ConferenceDoesntExistException; +import org.yacos.web.system.session.SessionService; public class ValidateArticleController extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValideOrRejectController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValideOrRejectController.java index e5f2c0e..414026c 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ValideOrRejectController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ValideOrRejectController.java @@ -1,23 +1,19 @@ package org.yacos.web.PCmember.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.view.RedirectView; -import org.springframework.web.servlet.ModelAndView; +import java.lang.reflect.UndeclaredThrowableException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; -import java.lang.reflect.UndeclaredThrowableException; -import java.util.List; -import org.yacos.web.system.controller.NoConferenceSelectedException; -import org.yacos.web.system.session.SessionService; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; +import org.springframework.web.servlet.view.RedirectView; import org.yacos.core.article.Article; import org.yacos.core.article.IArticleManager; import org.yacos.core.article.Article.State; -import org.yacos.core.exceptions.ConferenceDoesntExistException; public class ValideOrRejectController extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/author/controller/MainController.java b/YACOSWeb/src/org/yacos/web/author/controller/MainController.java index 08a2154..627b745 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/MainController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/MainController.java @@ -1,13 +1,15 @@ package org.yacos.web.author.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; public class MainController extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java index a132779..c2bf6f2 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/ManageArticleController.java @@ -1,20 +1,22 @@ package org.yacos.web.author.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.IOException; import java.util.ArrayList; import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; +import org.yacos.core.article.Article; +import org.yacos.core.article.IArticleManager; import org.yacos.web.author.form.ArticleBean; import org.yacos.web.system.controller.NoConferenceSelectedException; import org.yacos.web.system.session.SessionService; -import org.yacos.core.article.Article; -import org.yacos.core.article.IArticleManager; public class ManageArticleController extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java index 28d67ab..e341ada 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java @@ -5,9 +5,11 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.validation.BindException; diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java index 4f6a5e3..4e06376 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleControllerOK.java @@ -1,13 +1,15 @@ package org.yacos.web.author.controller; -import org.springframework.web.servlet.mvc.SimpleFormController; -import org.springframework.web.servlet.ModelAndView; +import java.io.IOException; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.IOException; +import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.SimpleFormController; public class SArticleControllerOK extends SimpleFormController { diff --git a/YACOSWeb/src/org/yacos/web/author/validator/ValidateSubmission.java b/YACOSWeb/src/org/yacos/web/author/validator/ValidateSubmission.java index 239c275..bc70832 100644 --- a/YACOSWeb/src/org/yacos/web/author/validator/ValidateSubmission.java +++ b/YACOSWeb/src/org/yacos/web/author/validator/ValidateSubmission.java @@ -7,55 +7,37 @@ import org.yacos.web.author.form.FormSubmission; public class ValidateSubmission implements Validator { + @SuppressWarnings("unchecked") public boolean supports(Class arg0) { return FormSubmission.class.isAssignableFrom(arg0); } public void validate(Object arg0, Errors arg1) { - - FormSubmission sub=(FormSubmission)arg0; - - String title=sub.getTitle(); - String theme=sub.getTheme(); - String abs=sub.getAbstractText(); - String mainauthor=sub.getMainauthor(); - String file=sub.getFile().getName(); - - if (title== null || title.trim().length() == 0) { - arg1.rejectValue("title", - "submissionArticle.title", - "Le title est n��cessaire !"); - } - - - if (theme==null|theme.trim().length()==0) - - { - arg1.rejectValue("theme", "submissionArticle.theme"); - } - - - if (abs==null|abs.trim().length()==0) - - { arg1.rejectValue("abstractText", "submissionArticle.abstractText", "text is not nullable"); - - } - - - /*if (mainauthor==null|mainauthor.trim().length()==0) - - { - arg1.rejectValue("mainauthor", "submissionArticle.mainauthor"); - }*/ - - - /* if (file==null|file.trim().length()==0) - - { - arg1.rejectValue("file", "submissionArticle.file"); - } - -*/ - } + FormSubmission sub=(FormSubmission)arg0; + + String title=sub.getTitle(); + String theme=sub.getTheme(); + String abs=sub.getAbstractText(); + + if (title== null || title.trim().length() == 0) { + arg1.rejectValue("title", + "submissionArticle.title", + "Le title est n��cessaire !"); + } + + + if (theme==null|theme.trim().length()==0) + + { + arg1.rejectValue("theme", "submissionArticle.theme"); + } + + + if (abs==null|abs.trim().length()==0) + + { arg1.rejectValue("abstractText", "submissionArticle.abstractText", "text is not nullable"); + + } + } } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index 4e3d9c7..f93fe7b 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -8,8 +8,10 @@ import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.mail.MailSendException; @@ -246,8 +248,8 @@ public class AddConferenceController extends AbstractWizardFormController { String action = request.getParameter("action"); if (action == null || action.equals("")) { - // TODO : tester ici si le gars a le droit d'être ici - // a-t-il le droit de créer une conférence ? + // TODO : tester ici si le gars a le droit d'�tre ici + // a-t-il le droit de cr�er une conf�rence ? criteria = new HashSet(); criteriaAll = new HashSet(); diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java b/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java index b177710..ca365cc 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/PCMemberBean.java @@ -1,6 +1,5 @@ package org.yacos.web.chairman.controller; -import org.yacos.core.article.Preference.PreferenceType; public class PCMemberBean { private String login; diff --git a/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java b/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java index 2fee062..ff07e14 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java +++ b/YACOSWeb/src/org/yacos/web/chairman/validation/ConferenceValidator.java @@ -12,6 +12,7 @@ import org.yacos.web.chairman.form.FormConference; public class ConferenceValidator implements Validator { + @SuppressWarnings("unchecked") public boolean supports(Class commandClass) { return FormConference.class.isAssignableFrom(commandClass); } diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java b/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java index 9c398b4..3cb7f93 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java +++ b/YACOSWeb/src/org/yacos/web/system/controller/ArticleDownloadController.java @@ -4,9 +4,11 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; + import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.springframework.util.FileCopyUtils; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/YACOSWeb/src/org/yacos/web/system/controller/ChooseConferenceController.java b/YACOSWeb/src/org/yacos/web/system/controller/ChooseConferenceController.java index ef5d712..551e765 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/ChooseConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/system/controller/ChooseConferenceController.java @@ -5,6 +5,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; import org.springframework.web.servlet.view.RedirectView; diff --git a/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java b/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java index b0493d1..7bfc166 100644 --- a/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java +++ b/YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java @@ -6,7 +6,6 @@ package org.yacos.web.system.controller; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.acegisecurity.providers.dao.UserCache; import org.springframework.validation.BindException; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; diff --git a/YACOSWeb/src/org/yacos/web/system/session/SessionService.java b/YACOSWeb/src/org/yacos/web/system/session/SessionService.java index 4f240aa..2554917 100644 --- a/YACOSWeb/src/org/yacos/web/system/session/SessionService.java +++ b/YACOSWeb/src/org/yacos/web/system/session/SessionService.java @@ -1,12 +1,11 @@ package org.yacos.web.system.session; -import java.util.List; - import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; + import org.acegisecurity.Authentication; import org.acegisecurity.context.SecurityContextHolder; import org.acegisecurity.providers.UsernamePasswordAuthenticationToken; @@ -18,7 +17,6 @@ import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.users.IUserManager; import org.yacos.core.users.User; -import org.yacos.core.users.Role; /** * Provides Session related Services