diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index 9e1a2a9..ea4927a 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -24,4 +24,7 @@ preference.indifferent=Indifferent
preference.dislike=Dislike
preference.ok=You have successfully chosen all your preferences about each article
-dispatch.title=Dispatch the articles to the members
\ No newline at end of file
+dispatch.title=Dispatch the articles to the members
+
+# Conference Form
+conference.linkMenu.title=Adding Conference
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
new file mode 100644
index 0000000..fdf8449
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
@@ -0,0 +1,45 @@
+<%@ include file="/WEB-INF/jsp/include.jsp"%>
+<%@ page session="false" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Add new conference
+
+
+
+ Formulaire ici
+
+ "/>
+
+
+
+
+
+
">Home
+
+
+
+
+
+
+
+
+
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp
index b9df6b7..220ce07 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/menu.jsp
@@ -8,6 +8,7 @@
">
">
">
+ ">
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index d5e1cfb..dff0ac4 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -51,8 +51,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
@@ -72,8 +81,10 @@
class="org.springframework.context.support.ResourceBundleMessageSource">
-
+
+
-
+
+
\ No newline at end of file
diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java
index ef30a86..c236b73 100644
--- a/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java
+++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/DispatchArticleController.java
@@ -39,8 +39,8 @@ public class DispatchArticleController extends SimpleFormController{
Collection articles = new ArrayList();
articles.add(a);
articles.add(a2);*/
- User m = new User("max","max","maxime","dagnicourt","ipint","m@truc.fr",new ArrayList());
- User m2 = new User("bob","bob","bob","dupont","lifl","b@bb.fr",new ArrayList());
+ User m = new User("max","max","maxime","dagnicourt","ipint","m@truc.fr");
+ User m2 = new User("bob","bob","bob","dupont","lifl","b@bb.fr");
Collection members = new ArrayList();
members.add(m);
members.add(m2);
@@ -56,8 +56,8 @@ public class DispatchArticleController extends SimpleFormController{
FormDispatcher fd = (FormDispatcher)formDispatcher;
Article article = articleManager.getArticle(fd.getIdArticle());
- User m = new User("bob","bob","maurice","dupont","lifl","b@bb.fr",new ArrayList());
- User m2 = new User("max","max","maxime","dagnicourt","ipint","m@truc.fr",new ArrayList());
+ User m = new User("bob","bob","maurice","dupont","lifl","b@bb.fr");
+ User m2 = new User("max","max","maxime","dagnicourt","ipint","m@truc.fr");
//article.assignToPCMember(m);
Collection members = new ArrayList();
members.add(m);
diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
new file mode 100644
index 0000000..fe1a8a9
--- /dev/null
+++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
@@ -0,0 +1,52 @@
+package org.yacos.web.chairman.controller;
+
+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.conferences.Conference;
+import org.yacos.core.conferences.IConferenceManager;
+
+public class AddConferenceController extends SimpleFormController{
+
+ protected final Log logger = LogFactory.getLog(getClass());
+
+ private IConferenceManager conferenceManager;
+ public IConferenceManager getConferenceManager() {
+ return conferenceManager;
+ }
+ public void setConferenceManager(IConferenceManager conferenceManager) {
+ this.conferenceManager = conferenceManager;
+ }
+
+ protected Object formBackingObject(HttpServletRequest request) throws Exception
+ {
+ Conference conference = null;
+
+ conference = new Conference();
+
+ return conference;
+
+ }
+
+
+ protected ModelAndView onSubmit(HttpServletRequest request,
+ HttpServletResponse response, Object command, BindException errors)
+ throws Exception
+ {
+ // TODO Auto-generated method stub
+ return super.onSubmit(request, response, command, errors);
+ }
+
+
+
+
+
+
+
+
+}