Merge pull request #457 from apache/simplified-upload

lukaszlenart · web-flow · commit d09ddbb60ebc · 2025-05-14T08:23:41.000+02:00
Simplifies file upload example
diff --git a/file-upload/src/main/java/org/apache/struts/example/UploadAction.java b/file-upload/src/main/java/org/apache/struts/example/UploadAction.java
@@ -41,10 +41,6 @@ public String execute() throws Exception {
         return INPUT;
     }
 
-    public String upload() throws Exception {
-        return SUCCESS;
-    }
-
     public File[] getUpload() {
         return upload;
     }
diff --git a/file-upload/src/main/resources/struts.xml b/file-upload/src/main/resources/struts.xml
@@ -12,16 +12,11 @@
 
         <action name="index">
             <result type="redirectAction">
-                <param name="actionName">input</param>
+                <param name="actionName">upload</param>
             </result>
         </action>
 
-        <action name="input" class="org.apache.struts.example.UploadAction">
-            <result name="input">WEB-INF/input.jsp</result>
-        </action>
-
-        <action name="upload" class="org.apache.struts.example.UploadAction" method="upload">
-            <result>WEB-INF/upload.jsp</result>
+        <action name="upload" class="org.apache.struts.example.UploadAction">
             <result name="input">WEB-INF/upload.jsp</result>
         </action>
 
diff --git a/file-upload/src/main/webapp/WEB-INF/input.jsp b/file-upload/src/main/webapp/WEB-INF/input.jsp
diff --git a/file-upload/src/main/webapp/WEB-INF/upload.jsp b/file-upload/src/main/webapp/WEB-INF/upload.jsp
@@ -7,20 +7,23 @@
 
 <body>
 
-<p>
-<s:a action="input">back to input</s:a>
-</p>
+<s:form action="upload" method="post" enctype="multipart/form-data">
+    <s:file name="upload"/>
+    <s:file name="upload"/>
+    <s:file name="upload"/>
+    <s:submit/>
+</s:form>
 
 <s:actionerror/>
 
 <s:iterator value="upload" var="u">
-    <s:property value="u"/><br/>
+    File: <s:property value="u"/><br/>
 </s:iterator>
 <s:iterator value="uploadContentType" var="ct">
-    <s:property value="ct"/><br/>
+    Content-Type: <s:property value="ct"/><br/>
 </s:iterator>
 <s:iterator value="uploadFileName" var="fn">
-    <s:property value="fn"/><br/>
+    File name: <s:property value="fn"/><br/>
 </s:iterator>
 
 </body>

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,6 @@ public String execute() throws Exception {`
`41`	`41`	`return INPUT;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public String upload() throws Exception {`
`45`		`- return SUCCESS;`
`46`		`- }`
`47`		`-`
`48`	`44`	`public File[] getUpload() {`
`49`	`45`	`return upload;`
`50`	`46`	`}`