From d63ab989b74da42baea2e22f860e3f9ba66793e0 Mon Sep 17 00:00:00 2001
From: Frederic Debuire <frederic.debuire@gmail.com>
Date: Fri, 14 Dec 2007 13:15:15 +0000
Subject: [PATCH]

---
 .../WEB-INF/classes/messages.properties        |  2 +-
 .../WEB-INF/jsp/submissionArticle.jsp          | 18 ++++++++++++++++++
 .../WEB-INF/jsp/submissionArticleOK.jsp        | 18 ++++++++++++++++++
 YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml  | 17 +++++++++++++----
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index fb60a38..806af3f 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -1,6 +1,6 @@
 title=Yacos
 
-form.submission.title=Article's submission
+submission.title=Article's submission
 form.submission.article.title=Article's title
 form.submission.article.theme=Article's theme
 form.submission.listauthor=Article's author
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
index 12fa95e..bc89db5 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
@@ -11,6 +11,24 @@
 
 <h2 align="center"><fmt:message key="submission.title" /></h2>
 
+<form:form method="post" commandName="submissionArticle">
+	<fmt:message key="form.submission.article.title" /> <form:input path="title"/> <br/><br />
+	<fmt:message key="form.submission.article.theme" /> <form:input path="theme"/> <br/><br />
+	
+	<hr /> <br />
+	
+	<fmt:message key="form.submission.listauthor" /> <br /><br />
+	<fmt:message key="form.submission.mainauthor" /> <form:input path="mainauthor"/> <input type="submit" name="addMain" value=<fmt:message key="button.add" />> <br/><br />
+	<fmt:message key="form.submission.secondaryauthor" /> <form:input path="secondaryauthor"/> <input type="submit" name="addSecondary" value=<fmt:message key="button.add" />> <br/><br />
+	
+	<textarea name="AreaAuthor" rows=10 cols=40></textarea> <br />
+	
+	<hr /> <br />
+	
+	<fmt:message key="form.submission.file" /> <form:input path="file"/> <input type="submit" value="Parcourir"> <br/><br />
+	<input type="submit" value=<fmt:message key="button.cancel" />>
+	<input type="submit" value=<fmt:message key="button.OK" />> <br/><br/>
+</form:form>
 
 
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
new file mode 100644
index 0000000..415299b
--- /dev/null
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleOK.jsp
@@ -0,0 +1,18 @@
+<%@ include file="/WEB-INF/jsp/include.jsp"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+
+<html>
+
+<head>
+<title><fmt:message key="title" /></title>
+</head>
+
+<body>
+
+Soumission OK
+
+<a href="<c:url value="main.htm"/>">Home</a>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
index fffa012..78e3a3d 100644
--- a/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
+++ b/YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
@@ -10,9 +10,18 @@
 
 	<!-- the application context definition for the SiteWebSpring DispatcherServlet -->
 
-	<bean name="/main.htm" class="org.yacos.core.web.MainController" />
+	<bean name="/main.htm" class="org.yacos.web.author.controller.MainController" />
 	
-	<bean name="/submissionArticle.htm" class="org.yacos.core.web.SArticleController" />
+	<bean name="/submissionArticleOK.htm" class="org.yacos.web.author.controller.SArticleControllerOK" />
+	
+	<bean name="/submissionArticle.htm" class="org.yacos.web.author.controller.SArticleController">
+		<property name="sessionForm" value="true" />
+		<property name="commandName" value="submissionArticle" />
+		<property name="commandClass" value="org.yacos.web.author.form.FormSubmission" />
+		<property name="formView" value="submissionArticle" />
+		<property name="successView" value="submissionArticleOK.htm" />
+		<property name="articleManager" ref="articleManager" />
+	</bean>
 	
 	<bean id="viewResolver"
 		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
@@ -28,7 +37,7 @@
 		<property name="basename" value="messages" />
 	</bean>
 
-	<!-- <jee:jndi-lookup id="articleManager" jndi-name="ArticleManagerBean/remote"
-		cache="true" /> -->
+	<jee:jndi-lookup id="articleManager" jndi-name="ArticleManagerBean/remote"
+		cache="true" />
 
 </beans>
\ No newline at end of file
