diff --git a/YACOSWeb/.classpath b/YACOSWeb/.classpath index ad46e5a..e1d1937 100644 --- a/YACOSWeb/.classpath +++ b/YACOSWeb/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp index fdf8449..604662d 100644 --- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp @@ -1,45 +1,53 @@ <%@ include file="/WEB-INF/jsp/include.jsp"%> -<%@ page session="false" %> +<%@ page session="false"%> - - <fmt:message key="title"/> - + +<fmt:message key="title" /> + + + + + + + -
-
 
-
- - +
+
 
+
- +

Add new conference

- + Formulaire ici - "/>

- - - - - -">Home + " /> +
+
+ Test + ">Home
-
-
 
+
 
- + diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp new file mode 100644 index 0000000..96475e4 --- /dev/null +++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp @@ -0,0 +1,38 @@ +<%@ include file="/WEB-INF/jsp/include.jsp"%> +<%@ page session="false"%> + + + + + +<fmt:message key="title" /> + + + + + + + +
+
 
+
+
+ + +

Add new conference

+ + + + Formulaire ici + + " /> +
+
+ + ">Home
+
+
 
+
+ + + diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml index dff0ac4..71f6144 100644 --- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml +++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml @@ -53,11 +53,15 @@ + + + + @@ -84,7 +88,7 @@ - + \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java index 3a1f89e..40730c5 100644 --- a/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java +++ b/YACOSWeb/src/org/yacos/web/PCmember/controller/ChoosePreferenceController.java @@ -12,7 +12,7 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.SimpleFormController; import org.yacos.core.article.*; -import org.yacos.core.users.IUsersManager; +import org.yacos.core.users.IUserManager; import org.yacos.core.users.User; //import org.yacos.web.author.form.*; import org.yacos.web.PCmember.form.FormPreference; @@ -23,7 +23,7 @@ public class ChoosePreferenceController extends SimpleFormController { protected final Log logger = LogFactory.getLog(getClass()); private IArticleManager articleManager; - private IUsersManager usersManager; + private IUserManager usersManager; @Override protected Object formBackingObject(HttpServletRequest request) @@ -81,11 +81,11 @@ public class ChoosePreferenceController extends SimpleFormController { this.articleManager = articleManager; } - public IUsersManager getUsersManager() { + public IUserManager getUsersManager() { return usersManager; } - public void setUsersManager(IUsersManager usersManager) { + public void setUsersManager(IUserManager usersManager) { this.usersManager = usersManager; } } \ No newline at end of file diff --git a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java index beb9ea3..1b401e4 100644 --- a/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java +++ b/YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java @@ -49,7 +49,7 @@ public class SArticleController extends SimpleFormController { else { byte b[] = file.getBytes(); - File file2 = new File(file.getOriginalFilename()); + File file2 = new File(file.getOriginalFilename()); //mettre le bon path ici FileOutputStream fos = new FileOutputStream(file2); diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java index fe1a8a9..2507d75 100644 --- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java @@ -8,45 +8,37 @@ 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.springframework.web.servlet.view.RedirectView; import org.yacos.core.conferences.IConferenceManager; +import org.yacos.web.chairman.form.FormConference; public class AddConferenceController extends SimpleFormController{ protected final Log logger = LogFactory.getLog(getClass()); - - private IConferenceManager conferenceManager; + + 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 + throws Exception { - // TODO Auto-generated method stub - return super.onSubmit(request, response, command, errors); + return new ModelAndView(new RedirectView(getSuccessView())); } + protected Object formBackingObject(HttpServletRequest request) throws Exception + { + FormConference conference = null; - - - - - - + conference = new FormConference(); + + return conference; + + } } diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java new file mode 100644 index 0000000..68138ee --- /dev/null +++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController2.java @@ -0,0 +1,28 @@ +package org.yacos.web.chairman.controller; + +import org.springframework.web.servlet.mvc.SimpleFormController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.IOException; +import java.util.Date; + +public class AddConferenceController2 extends SimpleFormController { + + protected final Log logger = LogFactory.getLog(getClass()); + + public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + + logger.info("Returning addConference2 view"); + + return new ModelAndView("addConference2"); + } + +} \ No newline at end of file