From 31f2f1f7105edceff119d929f05a5caa929c2bfa Mon Sep 17 00:00:00 2001 From: Christian Corsano Date: Thu, 31 Jan 2008 21:07:47 +0000 Subject: [PATCH] Web : correction de la generation des droits pour les utilisateur dans UserDetails. Rafraichissement des credentials lors du changement de conference Integration d'Acegi dans la gestion de l'utilisateur courant de SessionService --- .../WEB-INF/applicationContextAcegi.xml | 2 +- .../WEB-INF/classes/messages.properties | 4 ++++ .../WebContent/WEB-INF/decorators/usermenu.jsp | 2 +- .../WEB-INF/jsp/secure/userinformation.jsp | 2 +- YACOSWeb/WebContent/WEB-INF/users.properties | 3 --- YACOSWeb/src/org/yacos/auth/UserDetails.java | 3 +-- .../web/system/session/SessionService.java | 18 ++++++++++++++---- 7 files changed, 22 insertions(+), 12 deletions(-) delete mode 100644 YACOSWeb/WebContent/WEB-INF/users.properties diff --git a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml index 569b1c0..32b44ad 100644 --- a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml +++ b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml @@ -96,7 +96,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON PATTERN_TYPE_APACHE_ANT - /secure/**=ROLE_ADMIN,ROLE_AUTHOR,ROLE_MEMBER + /secure/**=ROLE_ADMIN,ROLE_AUTHOR,ROLE_PCMEMBER /secure/**=IS_AUTHENTICATED_REMEMBERED /**=IS_AUTHENTICATED_ANONYMOUSLY diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index 8c11f38..2e248b9 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -18,6 +18,10 @@ menu.pcmember.title=PC Member menu.referee.title=Referee menu.author.title=Author menu.anonymous.title=Menu +CHAIRMAN=Chairman +PCMEMBER=PC Member +REFEREE=Referee +AUTHOR=Author ################### # REGISTRATION USER diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index 367518b..0d97a22 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -21,7 +21,7 @@ - +