- ${article.title}
+ ${article.title}
|
${article.state}
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/tableBord.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/tableBord.jsp
index 887118d..72d2c29 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/tableBord.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/tableBord.jsp
@@ -4,11 +4,11 @@
-
+
-
+
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
index 64a2059..ee9cde9 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
@@ -10,8 +10,8 @@
TiTle: ${article.title}
Author: ${article.mainAuthor}
Topic: ${article.topic}
- State: ${article.state} ">
- ">
+ State: ${article.state} ">
+ ">
"> ">
diff --git a/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-jboss-1.0.6.jar b/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-jboss-1.0.6.jar
new file mode 100644
index 0000000..1a00643
Binary files /dev/null and b/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-jboss-1.0.6.jar differ
diff --git a/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-tiger-1.0.6.jar b/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-tiger-1.0.6.jar
new file mode 100644
index 0000000..6ff9745
Binary files /dev/null and b/YACOSWeb/WebContent/WEB-INF/lib/acegi-security-tiger-1.0.6.jar differ
diff --git a/YACOSWeb/WebContent/WEB-INF/web.xml b/YACOSWeb/WebContent/WEB-INF/web.xml
index 36df9ef..070ff58 100644
--- a/YACOSWeb/WebContent/WEB-INF/web.xml
+++ b/YACOSWeb/WebContent/WEB-INF/web.xml
@@ -36,17 +36,6 @@
yacos
/dwr/*
-
-
-
- lazyLoadingFilter
- org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter
-
-
- lazyLoadingFilter
- /onverracaplustard
-
-
@@ -99,7 +88,7 @@
SessionService
- /*
+ *.htm
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index 4924851..b0628c7 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -36,7 +36,7 @@
ListConferenceController
ChooseConferenceController
ValidateArticleController
- ValideOrRejectController
+ ValidateOrRejectController
LogonController
ListEvaluationController
ArticleDownloadController
@@ -45,7 +45,8 @@
ForgotPasswordController
DetailArticleController
TableBordController
- StateArticleController
+ StateArticleController
+ AdminController
@@ -58,6 +59,27 @@
+
+
+
+
+
+
+
+
+ show
+
+
+
+
+ show
+
+
+
+
+
+
@@ -139,8 +161,8 @@
-
+
@@ -161,7 +183,8 @@
+ class="org.yacos.web.chairman.controller.AddConferenceController"
+ scope="session">
@@ -286,11 +309,11 @@
-
-
-
-
+
+
+
+
authoritiesList = new ArrayList();
+
+ if(SessionService.getInstance().getConferenceManager().canCreateConference(login)){
+ authoritiesList.add(new GrantedAuthorityImpl("ROLE_CONFERENCE_CREATOR"));
+ }
if(currentConferenceId != null){
List rolesList = SessionService.getInstance().getConferenceManager().getRoles(login, currentConferenceId);
- if(! rolesList.isEmpty()){
- authorities = new GrantedAuthority[rolesList.size()];
- }
for(int i=0;i |