diff --git a/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml new file mode 100644 index 0000000..690d63a --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml @@ -0,0 +1,140 @@ + + + + + + + + + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON + PATTERN_TYPE_APACHE_ANT + /**=httpSessionContextIntegrationFilter,logoutFilter,authenticationProcessingFilter,securityContextHolderAwareRequestFilter,rememberMeProcessingFilter,anonymousProcessingFilter,exceptionTranslationFilter,filterInvocationInterceptor + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON + PATTERN_TYPE_APACHE_ANT + /secure/**=ROLE_ADMIN,ROLE_AUTHOR,ROLE_MEMBER + /secure/**=IS_AUTHENTICATED_REMEMBERED + /**=IS_AUTHENTICATED_ANONYMOUSLY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties index ab24680..cecd41b 100644 --- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties +++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties @@ -5,16 +5,8 @@ title=Yacos disclaimer.text=Copyrights © 2008. Yacos Team. All rights reserved. disclaimer.link.about=About -submission.title=Article's submission - -form.submission.article.title=Article's title -form.submission.article.theme=Article's theme -form.submission.article.abstractText=Abstract -form.submission.listauthor=Article's author -form.submission.mainauthor=Main author -form.submission.secondaryauthor=Secondary author -form.submission.file=File - +################### +# REGISTRATION USER register.title=User Registration form.register.user.login=Login form.register.user.email=eMail @@ -31,6 +23,19 @@ form.register.error.lastNameEmpty=Last name is required form.register.error.passwordEmpty=The password can't be empty form.register.error.alreadyExists=A user with this login already exists. Please check you haven't already registered or change your login. + +submission.title=Article's submission + +form.submission.article.title=Article's title +form.submission.article.theme=Article's theme +form.submission.article.abstractText=Abstract +form.submission.listauthor=Article's author +form.submission.mainauthor=Main author +form.submission.secondaryauthor=Secondary author +form.submission.file=File + + + button.add=Add button.browse=Browse button.reset=Reset diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/include.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/include.jsp index 370bba3..a89c639 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/include.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/include.jsp @@ -1,3 +1,4 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="authz" uri="http://acegisecurity.org/authz" %> diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp index 21ce25b..73e6b1e 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp @@ -21,7 +21,9 @@
Logo Yacos Texte
- +
+ +
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp index aca8821..74e1d35 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp +++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp @@ -5,8 +5,9 @@ diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headeruser.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp similarity index 50% rename from YACOSWeb/WebContent/WEB-INF/decorators/headeruser.jsp rename to YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp index d49c60d..30ae70e 100644 --- a/YACOSWeb/WebContent/WEB-INF/decorators/headeruser.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/denied.jsp @@ -4,10 +4,7 @@ - -
- - User Login -
+Acces denied. Sorry for this inconvenience. + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp new file mode 100644 index 0000000..5cf6f42 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/login.jsp @@ -0,0 +1,42 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> +<%@ page import="org.acegisecurity.context.SecurityContextHolder" %> + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
User: +
Password:
Se souvenir de moi
+
+ + + +

Welcome: <%= SecurityContextHolder.getContext().getAuthentication().getName() %>

+
+ + + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp index 4144660..da37f24 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp @@ -1,4 +1,5 @@ <%@ include file="/WEB-INF/decorators/include.jsp"%> +<%@ page import="org.acegisecurity.context.SecurityContextHolder" %> @@ -8,7 +9,13 @@ ${user} ${conference} Page d'accueil à changer de place (controller dans system et non dans author) Si conf active : page d'intro de la conf -si pas de conf active : page d'intro du site (visiteur) +si pas de conf active : page d'intro du site (visiteur)

+ + UserName :
+Seulement si ROLE_AUTHOR : + +

Bienvenue: <%= SecurityContextHolder.getContext().getAuthentication().getName() %>

+
\ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp new file mode 100644 index 0000000..a640a28 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp @@ -0,0 +1,14 @@ +<%@ include file="/WEB-INF/decorators/include.jsp"%> +<%@ page import="org.acegisecurity.context.SecurityContextHolder" %> + + + + + + +

Welcome: <%= SecurityContextHolder.getContext().getAuthentication().getName() %>

+

Home +

Logout + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-1.0.6.jar b/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-1.0.6.jar new file mode 100644 index 0000000..c637ba7 Binary files /dev/null and b/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-1.0.6.jar differ diff --git a/YACOSWeb/WebContent/WEB-INF/lib/commons-codec-1.3.jar b/YACOSWeb/WebContent/WEB-INF/lib/commons-codec-1.3.jar new file mode 100644 index 0000000..957b675 Binary files /dev/null and b/YACOSWeb/WebContent/WEB-INF/lib/commons-codec-1.3.jar differ diff --git a/YACOSWeb/WebContent/WEB-INF/lib/ehcache-1.2.4.jar b/YACOSWeb/WebContent/WEB-INF/lib/ehcache-1.2.4.jar new file mode 100644 index 0000000..a149f43 Binary files /dev/null and b/YACOSWeb/WebContent/WEB-INF/lib/ehcache-1.2.4.jar differ diff --git a/YACOSWeb/WebContent/WEB-INF/users.properties b/YACOSWeb/WebContent/WEB-INF/users.properties new file mode 100644 index 0000000..6a8a35a --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/users.properties @@ -0,0 +1,3 @@ +maxime=maxime,ROLE_AUTHOR +fred=fred,ROLE_MEMBER +jialin=jialin,ROLE_ADMIN \ No newline at end of file diff --git a/YACOSWeb/WebContent/WEB-INF/web.xml b/YACOSWeb/WebContent/WEB-INF/web.xml index 3775937..865180e 100644 --- a/YACOSWeb/WebContent/WEB-INF/web.xml +++ b/YACOSWeb/WebContent/WEB-INF/web.xml @@ -50,5 +50,33 @@ /* + + + + Acegi Filter Chain Proxy + org.acegisecurity.util.FilterToBeanProxy + + targetClass + org.acegisecurity.util.FilterChainProxy + + + + + Acegi Filter Chain Proxy + /* + + + + + org.springframework.web.context.ContextLoaderListener + + + + contextConfigLocation + /WEB-INF/applicationContextAcegi.xml + + + + \ No newline at end of file diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css index baac1da..b9bca58 100644 --- a/YACOSWeb/WebContent/stylesheets/base.css +++ b/YACOSWeb/WebContent/stylesheets/base.css @@ -142,7 +142,7 @@ body { margin: 18px auto; position: relative; color: #b8b8b8; - font-size: 8px; + font-size: 10px; text-align: center; }