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

Changement de la méthode pour l'envoie du fichier...

Browse Source
This commit is contained in:
Frederic Debuire
2007-12-16 18:06:40 +00:00
parent ef43e20036
commit 0ed5989981
9 changed files with 69 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
YACOSWeb/WebContent/WEB-INF/fileupload.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<flow xmlns="http://www.springframework.org/schema/webflow"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/webflow
http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
<start-state idref="selectFile"/>
<view-state id="selectFile" view="submissionArticleFile">
<transition on="submit" to="uploadFile"/>
</view-state>
<action-state id="uploadFile">
<action bean="uploadAction"/>
<transition on="success" to="selectFile">
<set attribute="fileUploaded" scope="flash" value="true"/>
</transition>
<transition on="error" to="selectFile"/>
</action-state>
</flow>

31
YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
View File

@@ -5,13 +5,25 @@
<head> <head>
<title><fmt:message key="title" /></title> <title><fmt:message key="title" /></title>
<SCRIPT LANGUAGE="JavaScript">
function Ajouter(form) {
var o=new Option(form.mainauthor.value);
form.liste.options[form.liste.options.length]=o;
}
function Ajouter2(form) {
var o=new Option(form.secondaryauthor.value);
form.liste.options[form.liste.options.length]=o;
}
</SCRIPT>
</head> </head>
<body> <body>
<h2 align="center"><fmt:message key="submission.title" /></h2> <h2 align="center"><fmt:message key="submission.title" /></h2>
<form:form method="post" commandName="submissionArticle"> <form:form method="post" enctype="multipart/form-data" commandName="submissionArticle">
<fmt:message key="form.submission.article.title" /> <form:input path="title"/> <br/><br /> <fmt:message key="form.submission.article.title" /> <form:input path="title"/> <br/><br />
@@ -20,12 +32,21 @@
<hr /> <br /> <hr /> <br />
<fmt:message key="form.submission.listauthor" /> <br /><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.mainauthor" /> <form:input path="mainauthor" />
<fmt:message key="form.submission.secondaryauthor" /> <form:input path="secondaryauthor"/> <input type="submit" name="addSecondary" value=<fmt:message key="button.add" />> <br/><br /> <input type="button" name="addMain" onClick="Ajouter(this.form)" value=<fmt:message key="button.add" />> <br/><br />
<fmt:message key="form.submission.secondaryauthor" /> <form:input path="secondaryauthor" />
<input type="button" name="addSecondary" onClick="Ajouter2(this.form)" value=<fmt:message key="button.add" />> <br/><br />
<textarea name="AreaAuthor" rows=10 cols=40></textarea> <br /> <form:select path="liste" size="5" itemValue="test">
</form:select>
<br />
<hr /> <br /> <hr />
File : <input type="file" name="file"/>
<br /><br />
<input type="submit" value=<fmt:message key="button.cancel" />> <input type="submit" value=<fmt:message key="button.cancel" />>
<input type="submit" value=<fmt:message key="button.OK" />> <br/><br/> <input type="submit" value=<fmt:message key="button.OK" />> <br/><br/>

45
YACOSWeb/WebContent/WEB-INF/jsp/submissionArticleFile.jsp
View File

@@ -1,45 +0,0 @@
<%@ page contentType="text/html" %>
<%@ page session="true" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
<form name="submitForm" method="post" enctype="multipart/form-data" action="submissionArticleOK.htm">
<table>
<c:if test="${fileUploaded}">
<p>File uploaded succesfully.</p>
<c:if test="${!empty(file)}">
<pre style="border: solid 1px;">${file}</pre>
</c:if>
</c:if>
<tr>
<td>
File:
</td>
<td>
<input type="file" name="file">
</td>
</tr>
<tr>
<td colspan="2"> </td>
</tr>
<tr>
<td colspan="2" class="buttonBar">
<input type="hidden" name="_flowExecutionKey" value="${flowExecutionKey}">
<input type="submit" class="button" name="_eventId_submit" value="Upload">
</td>
</tr>
</table>
</form>
</body>
</html>

BIN
YACOSWeb/WebContent/WEB-INF/lib/ognl-2.6.9.jar
View File

Binary file not shown.

BIN
YACOSWeb/WebContent/WEB-INF/lib/spring-webflow-1.0.5.jar
View File

Binary file not shown.

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

@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" <beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:flow="http://www.springframework.org/schema/webflow-config"
xmlns:jee="http://www.springframework.org/schema/jee" xmlns:jee="http://www.springframework.org/schema/jee"
xsi:schemaLocation="http://www.springframework.org/schema/beans xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/webflow-config
http://www.springframework.org/schema/webflow-config/spring-webflow-config-1.0.xsd
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee
http://www.springframework.org/schema/jee/spring-jee-2.5.xsd"> http://www.springframework.org/schema/jee/spring-jee-2.5.xsd">
@@ -22,17 +19,17 @@
<property name="commandName" value="submissionArticle" /> <property name="commandName" value="submissionArticle" />
<property name="commandClass" value="org.yacos.web.author.form.FormSubmission" /> <property name="commandClass" value="org.yacos.web.author.form.FormSubmission" />
<property name="formView" value="submissionArticle" /> <property name="formView" value="submissionArticle" />
<property name="successView" value="submissionArticleFile.htm?_flowId=fileupload" /> <property name="successView" value="submissionArticleOK.htm" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
</bean> </bean>
<bean name="/choosePreference.htm" class="org.yacos.web.PCmember.controller.ChoosePreferenceControl"> <!-- <bean name="/choosePreference.htm" class="org.yacos.web.PCmember.controller.ChoosePreferenceControl">
<property name="commandName" value="choose"/> <property name="commandName" value="choose"/>
<property name="commandClass" value="org.yacos.web.author.form.FormPreference" /> <property name="commandClass" value="org.yacos.web.author.form.FormPreference" />
<property name="formView" value="choosePreference" /> <property name="formView" value="choosePreference" />
<property name="successView" value="choosePreferenceOK" /> <property name="successView" value="choosePreferenceOK" />
<property name="articleManager" ref="articleManager" /> <property name="articleManager" ref="articleManager" />
</bean> </bean> -->
<bean id="viewResolver" <bean id="viewResolver"
class="org.springframework.web.servlet.view.InternalResourceViewResolver"> class="org.springframework.web.servlet.view.InternalResourceViewResolver">
@@ -43,28 +40,11 @@
<property name="suffix" value=".jsp"></property> <property name="suffix" value=".jsp"></property>
</bean> </bean>
<bean name="/submissionArticleFile.htm" class="org.springframework.webflow.executor.mvc.FlowController">
<property name="flowExecutor" ref="flowExecutor" />
</bean>
<!-- Launches new flow executions and resumes existing executions. -->
<flow:executor id="flowExecutor" registry-ref="flowRegistry" repository-type="singlekey"/>
<!-- Creates the registry of flow definitions for this application -->
<flow:registry id="flowRegistry">
<flow:location path="/WEB-INF/fileupload.xml" />
</flow:registry>
<!--
Support for multipart requests using commons file upload
Make sure you have the commons-fileupload.jar in your classpath
-->
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"> <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<!-- Limit uploads to small (5KB) files for this sample --> <property name="maxUploadSize" value="100000" />
<property name="maxUploadSize" value="5120" />
</bean> </bean>
<bean id="uploadAction" class="org.yacos.web.utils.FileUploadAction" />
<bean id="messageSource" <bean id="messageSource"
class="org.springframework.context.support.ResourceBundleMessageSource"> class="org.springframework.context.support.ResourceBundleMessageSource">

18
YACOSWeb/src/org/yacos/web/author/controller/SArticleController.java
View File

@@ -1,10 +1,13 @@
package org.yacos.web.author.controller; package org.yacos.web.author.controller;
import java.util.List;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.mvc.SimpleFormController;
import org.springframework.web.servlet.view.RedirectView; import org.springframework.web.servlet.view.RedirectView;
@@ -26,8 +29,18 @@ public class SArticleController extends SimpleFormController {
String theme = ((FormSubmission) command).getTheme(); String theme = ((FormSubmission) command).getTheme();
String mainauthor = ((FormSubmission) command).getMainauthor(); String mainauthor = ((FormSubmission) command).getMainauthor();
String secondaryauthor = ((FormSubmission) command).getSecondaryauthor(); String secondaryauthor = ((FormSubmission) command).getSecondaryauthor();
String file = ((FormSubmission) command).getFile(); //String file = ((FormSubmission) command).getFile();
String liste = ((FormSubmission) command).getListe();
System.out.println(liste);
// let's see if there's content there
MultipartFile file = ((FormSubmission) command).getFile();
if (file == null) {
// hmm, that's strange, the user did not upload anything
}
Article a = new Article(0, title, theme, "", mainauthor, null, 1); Article a = new Article(0, title, theme, "", mainauthor, null, 1);
articleManager.addArticle(a); articleManager.addArticle(a);
@@ -40,8 +53,7 @@ public class SArticleController extends SimpleFormController {
myArticle.setTitle("Le titre de l'article"); myArticle.setTitle("Le titre de l'article");
myArticle.setTheme("Le theme de l'article"); myArticle.setTheme("Le theme de l'article");
myArticle.setMainauthor("L'auteur principal"); myArticle.setMainauthor("L'auteur principal");
myArticle.setSecondaryauthor("Les auteurs n°2"); myArticle.setSecondaryauthor("Les auteurs secondaires");
myArticle.setFile("Le fichier");
return myArticle; return myArticle;
} }

25
YACOSWeb/src/org/yacos/web/author/form/FormSubmission.java
View File

@@ -1,16 +1,29 @@
package org.yacos.web.author.form; package org.yacos.web.author.form;
import java.util.List;
import org.springframework.web.multipart.MultipartFile;
public class FormSubmission { public class FormSubmission {
private MultipartFile file;
private String title; private String title;
private String theme; private String theme;
private String mainauthor; private String mainauthor;
private String secondaryauthor; private String secondaryauthor;
private String file; private String liste;
public FormSubmission() { public FormSubmission() {
} }
public void setFile(MultipartFile file) {
this.file = file;
}
public MultipartFile getFile() {
return file;
}
public String getTitle() { public String getTitle() {
return title; return title;
@@ -36,11 +49,13 @@ public class FormSubmission {
public void setSecondaryauthor(String secondaryauthor) { public void setSecondaryauthor(String secondaryauthor) {
this.secondaryauthor = secondaryauthor; this.secondaryauthor = secondaryauthor;
} }
public String getFile() {
return file; public String getListe() {
return liste;
} }
public void setFile(String file) {
this.file = file; public void setListe(String liste) {
this.liste = liste;
} }
} }

20
YACOSWeb/src/org/yacos/web/utils/FileUploadAction.java
View File

@@ -1,20 +0,0 @@
package org.yacos.web.utils;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.webflow.action.AbstractAction;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
public class FileUploadAction extends AbstractAction {
protected Event doExecute(RequestContext context) throws Exception {
MultipartFile file = context.getRequestParameters().getRequiredMultipartFile("file");
if (file.getSize() > 0) {
// data was uploaded
context.getFlashScope().put("file", new String(file.getBytes()));
return success();
} else {
return error();
}
}
}