christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Browse Source
This commit is contained in:
Maxime Dagnicourt
2008-01-29 22:22:31 +00:00
parent c544189c3d
commit c2c4624627
7 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
View File

@@ -95,7 +95,7 @@
value="org.yacos.web.system.form.FormUser" />
<property name="formView" value="registerUser.htm" />
<property name="successView" value="listArticle.htm" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
<property name="sessionService" ref="sessionService" />
</bean>
@@ -119,13 +119,13 @@
<property name="formView" value="choosePreference" />
<property name="successView" value="choosePreference.htm" />
<property name="articleManager" ref="articleManager" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
<property name="conferenceManager" ref="conferenceManager" />
<property name="sessionService" ref="sessionService" />
</bean>
<bean id="DispatchArticleController"
class="org.yacos.web.PCmember.controller.DispatchArticleController">
class="org.yacos.web.chairman.controller.DispatchArticleController">
<property name="sessionForm" value="true" />
<property name="commandName" value="formDispatcher" />
<property name="commandClass"
@@ -133,7 +133,9 @@
<property name="formView" value="dispatchArticle" />
<property name="successView" value="dispatchArticle.htm" />
<property name="articleManager" ref="articleManager" />
<property name="sessionService" ref="sessionService" />
<property name="userManager" ref="userManager" />
<property name="conferenceManager" ref="conferenceManager" />
<!-- <property name="sessionService" ref="sessionService" /> -->
</bean>
<bean id="AddConferenceController5"
@@ -144,7 +146,7 @@
<property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
</bean>
<bean id="AddConferenceController4"
@@ -155,7 +157,7 @@
<property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
</bean>
<bean id="AddConferenceController3"
@@ -165,7 +167,7 @@
<property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
</bean>
<bean id="AddConferenceController2"
@@ -175,7 +177,7 @@
<property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
</bean>
<bean id="AddConferenceController"
@@ -185,7 +187,7 @@
<property name="commandClass"
value="org.yacos.web.chairman.form.FormConference" />
<property name="conferenceManager" ref="conferenceManager" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
</bean>
<bean id="EvaluationController"
@@ -197,7 +199,7 @@
<property name="formView" value="evaluation" />
<property name="successView" value="createReport.htm" />
<property name="articleManager" ref="articleManager" />
<property name="usersManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
<property name="conferenceManager" ref="conferenceManager" />
</bean>
@@ -278,13 +280,13 @@
<bean id="sessionService"
class="org.yacos.web.system.controller.SessionService">
<property name="conferenceManager" ref="conferenceManager" />
<property name="userManager" ref="usersManager" />
<property name="userManager" ref="userManager" />
</bean>
<!-- EJB Services Linking -->
<jee:jndi-lookup id="articleManager"
jndi-name="ArticleManagerBean/remote" cache="true" />
<jee:jndi-lookup id="usersManager"
<jee:jndi-lookup id="userManager"
jndi-name="UserManagerBean/remote" cache="true" />
<jee:jndi-lookup id="conferenceManager"
jndi-name="ConferenceManagerBean/remote" cache="true" />

6
YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java
View File

@@ -97,12 +97,12 @@ public class ChoosePreferenceController extends SimpleFormController {
this.articleManager = articleManager;
}
public IUserManager getUsersManager() {
public IUserManager getUserManager() {
return userManager;
}
public void setUsersManager(IUserManager usersManager) {
this.userManager = usersManager;
public void setUserManager(IUserManager userManager) {
this.userManager = userManager;
}
public IConferenceManager getConferenceManager() {

6
YACOSWeb/src/org/yacos/web/PCmember/controller/EvaluationController.java
View File

@@ -125,12 +125,12 @@ public class EvaluationController extends SimpleFormController {
this.articleManager = articleManager;
}
public IUserManager getUsersManager() {
public IUserManager getUserManager() {
return userManager;
}
public void setUsersManager(IUserManager usersManager) {
this.userManager = usersManager;
public void setUserManager(IUserManager userManager) {
this.userManager = userManager;
}
public IConferenceManager getConferenceManager() {

3
YACOSWeb/src/org/yacos/web/author/controller/MainController.java
View File

@@ -20,9 +20,8 @@ public class MainController extends SimpleFormController {
// FIXME : this is no longer necessary
request.getSession().setAttribute("user","toto");
request.getSession().setAttribute("conference",1);
request.getSession().setAttribute("idCurrentConference",1);
//FIXME
return new ModelAndView("main");
}
}

14
YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
View File

@@ -29,13 +29,13 @@ public class AddConferenceController extends AbstractWizardFormController {
private IConferenceManager conferenceManager;
private IUserManager usersManager;
private IUserManager userManager;
public IUserManager getUsersManager() {
return usersManager;
public IUserManager getUserManager() {
return userManager;
}
public void setUsersManager(IUserManager usersManager) {
this.usersManager = usersManager;
public void setUserManager(IUserManager userManager) {
this.userManager = userManager;
}
public IConferenceManager getConferenceManager() {
return conferenceManager;
@@ -45,8 +45,6 @@ public class AddConferenceController extends AbstractWizardFormController {
}
// ###########################################################
private static int nextPerson = 1;
@@ -57,7 +55,7 @@ public class AddConferenceController extends AbstractWizardFormController {
public void initPerson() {
listPersonBean = new ArrayList<PersonBean>();
listPersonAdded = new ArrayList<PersonBean>();
List<User> listUsers = usersManager.getUsers();
List<User> listUsers = userManager.getUsers();
for (Iterator i = listUsers.iterator(); i.hasNext();) {
User user = (User) i.next();

79
YACOSWeb/src/org/yacos/web/chairman/controller/DispatchArticleController.java Normal file
View File

@@ -0,0 +1,79 @@
package org.yacos.web.chairman.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;
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.conferences.Conference;
import org.yacos.core.conferences.IConferenceManager;
import org.yacos.core.exceptions.ConferenceDoesntExistException;
import org.yacos.core.users.IUserManager;
import org.yacos.core.users.Role.RoleType;
import org.yacos.core.users.User;
import org.yacos.web.PCmember.form.FormDispatcher;
public class DispatchArticleController extends SimpleFormController{
protected final Log logger = LogFactory.getLog(getClass());
private IArticleManager articleManager;
public IArticleManager getArticleManager() {
return articleManager;
}
public void setArticleManager(IArticleManager articleManager) {
this.articleManager = articleManager;
}
private IUserManager userManager;
public IUserManager getUserManager() {
return userManager;
}
public void setUserManager(IUserManager userManager) {
this.userManager = userManager;
}
private IConferenceManager conferenceManager;
public IConferenceManager getConferenceManager() {
return conferenceManager;
}
public void setConferenceManager(IConferenceManager conferenceManager) {
this.conferenceManager = conferenceManager;
}
protected Object formBackingObject(HttpServletRequest request) throws ConferenceDoesntExistException {
logger.info("Returning dispatcher view");
//on recupere l'id de conference
int conf_id = Integer.parseInt(request.getSession().getAttribute("idCurrentConference").toString());
Collection<User> members = userManager.getUsers(RoleType.PCMEMBER);
request.getSession().setAttribute("members",members);
request.getSession().setAttribute("articles",articleManager.getArticles(conf_id));
return new FormDispatcher();
}
protected ModelAndView onSubmit(HttpServletRequest request,
HttpServletResponse response,
Object formDispatcher, BindException errors) throws Exception {
//on recupere l'id de conference
Conference conf = (Conference)request.getSession().getAttribute("idCurrentConference");
FormDispatcher fd = (FormDispatcher)formDispatcher;
Article article = articleManager.getArticle(fd.getIdArticle());
return new ModelAndView("dispatchArticle", "articles", articleManager.getArticles(conf.getId()));
}
}

14
YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java
View File

@@ -23,7 +23,7 @@ import org.yacos.web.system.form.FormUser;
*
*/
public class SUserRegistrationController extends SimpleFormController {
private IUserManager usersManager;
private IUserManager userManager;
private SessionService sessionService;
@@ -47,13 +47,13 @@ public class SUserRegistrationController extends SimpleFormController {
// Tries to retrieve the current user : case of user modification
User user = sessionService.getCurrentUser(request);
if( (userCommand.getIsNew()) && (usersManager.getUser(userCommand.getLogin()) != null)){
if( (userCommand.getIsNew()) && (userManager.getUser(userCommand.getLogin()) != null)){
errors.rejectValue("login", "form.register.error.alreadyExists");
return new ModelAndView(new RedirectView(getFormView()));
}
if( userCommand.getIsNew() ){
usersManager.addUser(
userManager.addUser(
userCommand.getLogin(),
userCommand.getPassword(),
userCommand.getFirstName(),
@@ -102,11 +102,11 @@ public class SUserRegistrationController extends SimpleFormController {
return user;
}
public void setUsersManager(IUserManager usersManager) {
this.usersManager = usersManager;
public void setUserManager(IUserManager userManager) {
this.userManager = userManager;
}
public IUserManager getUsersManager() {
return usersManager;
public IUserManager getUserManager() {
return userManager;
}
}