(struts-site) branch fix/file-upload-navigation created (now 0fccbce23)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/file-upload-navigation in repository https://gitbox.apache.org/repos/asf/struts-site.git at 0fccbce23 Splits file upload page This branch includes the following new commits: new 0fccbce23 Splits file upload page The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts-site) 01/01: Splits file upload page
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/file-upload-navigation in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 0fccbce237ab3d2b4da12ea666d8c027373b86e8 Author: Lukasz Lenart AuthorDate: Sat Mar 16 16:34:44 2024 +0100 Splits file upload page --- .../action-file-upload-interceptor.md | 2 +- .../{file-upload.md => action-file-upload.md} | 199 ++--- source/core-developers/file-upload.md | 52 ++ 3 files changed, 24 insertions(+), 229 deletions(-) diff --git a/source/core-developers/action-file-upload-interceptor.md b/source/core-developers/action-file-upload-interceptor.md index 6019347ef..1c8902407 100644 --- a/source/core-developers/action-file-upload-interceptor.md +++ b/source/core-developers/action-file-upload-interceptor.md @@ -10,7 +10,7 @@ parent: > Available since Struts 6.4.0 as replacement for [File Upload > Interceptor](file-upload-interceptor) -See [this page](file-upload) for more examples and advanced configuration. +See [this page](action-file-upload) for more examples and advanced configuration. Interceptor that is based off of `MultiPartRequestWrapper`, which is automatically applied for any request that includes a file. If an action implements `org.apache.struts2.action.UploadedFilesAware` interface, the interceptor will pass diff --git a/source/core-developers/file-upload.md b/source/core-developers/action-file-upload.md similarity index 67% copy from source/core-developers/file-upload.md copy to source/core-developers/action-file-upload.md index 054464f29..94f93950d 100644 --- a/source/core-developers/file-upload.md +++ b/source/core-developers/action-file-upload.md @@ -1,12 +1,12 @@ --- layout: default -title: File Upload +title: Action File Upload parent: title: Action File Upload Interceptor url: action-file-upload-interceptor --- -# File Upload +# Action File Upload {:.no_toc} * Will be replaced with the ToC, excluding a header @@ -24,14 +24,11 @@ than the temporary directory and the directories that belong to your web applica The Struts 2 framework leverages the Commons FileUpload library as a based library to support file upload in the framework. The library is included in a base Struts 2 distribution. -> NOTE: Since Struts 6.4.0 the `FileUploadInterceptor` is deprecated, and you should use `ActionFileUploadInterceptor` instead! - ## Basic Usage -The `org.apache.struts2.interceptor.FileUploadInterceptor` and `org.apache.struts2.interceptor.ActionFileUploadInterceptor` -interceptors are included as part of the `defaultStack` and named appropriately: `fileUpload` and `actionFileUpload`. -As long as the required libraries are added to your project you will be able to take advantage of the Struts 2 file upload -capability. Configure an Action mapping for your Action class as you typically would. +The `org.apache.struts2.interceptor.ActionFileUploadInterceptor` interceptor is included as part of the `defaultStack` +and named `actionFileUpload`. As long as the required libraries are added to your project you will be able to take +advantage of the Struts 2 file upload capability. Configure an Action mapping for your Action class as you typically would. ### Example action mapping: @@ -84,55 +81,6 @@ public class UploadAction extends ActionSupport implements UploadedFilesAware { } ``` -**Deprecated approach**: the fileUpload interceptor will use setter injection to insert the uploaded file and related data into your Action -class. For a form field named `upload` you would provide the three setter methods shown in the following example: - -### Example Action class: - -```java -package com.example; - -import java.io.File; - -import com.opensymphony.xwork2.ActionSupport; - -public class UploadAction extends ActionSupport { -private File file; -private String contentType; -private String filename; - -@StrutsParameter -public void setUpload(File file) { -this.file = file; -} - -@StrutsParameter -public void setUploadContentType(String contentType) { -this.contentType = contentType; -} - -@StrutsParameter -public void setUploadFileName(String filename) { -this.filename = filename; -} - -public String execute() { -//... -return SUCCESS; -} -} -``` - -The purpose of each one of these methods is described in the table below. Notice that if you have multiple file form -elements with different names you would be required to have another corresponding set of these methods for each file -uploaded. - -| Method Signature | Description | -|---|---
(struts-site) branch fix/file-upload-navigation updated (0fccbce23 -> 812ca70f7)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/file-upload-navigation in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 0fccbce23 Splits file upload page new 812ca70f7 Splits file upload page This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0fccbce23) \ N -- N -- N refs/heads/fix/file-upload-navigation (812ca70f7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: source/core-developers/file-upload.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-site) 01/01: Splits file upload page
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch fix/file-upload-navigation in repository https://gitbox.apache.org/repos/asf/struts-site.git commit 812ca70f7160d27b0180b71be7f95618b0549413 Author: Lukasz Lenart AuthorDate: Sat Mar 16 16:34:44 2024 +0100 Splits file upload page --- .../action-file-upload-interceptor.md | 2 +- .../{file-upload.md => action-file-upload.md} | 199 ++--- source/core-developers/file-upload.md | 52 ++ 3 files changed, 24 insertions(+), 229 deletions(-) diff --git a/source/core-developers/action-file-upload-interceptor.md b/source/core-developers/action-file-upload-interceptor.md index 6019347ef..1c8902407 100644 --- a/source/core-developers/action-file-upload-interceptor.md +++ b/source/core-developers/action-file-upload-interceptor.md @@ -10,7 +10,7 @@ parent: > Available since Struts 6.4.0 as replacement for [File Upload > Interceptor](file-upload-interceptor) -See [this page](file-upload) for more examples and advanced configuration. +See [this page](action-file-upload) for more examples and advanced configuration. Interceptor that is based off of `MultiPartRequestWrapper`, which is automatically applied for any request that includes a file. If an action implements `org.apache.struts2.action.UploadedFilesAware` interface, the interceptor will pass diff --git a/source/core-developers/file-upload.md b/source/core-developers/action-file-upload.md similarity index 67% copy from source/core-developers/file-upload.md copy to source/core-developers/action-file-upload.md index 054464f29..94f93950d 100644 --- a/source/core-developers/file-upload.md +++ b/source/core-developers/action-file-upload.md @@ -1,12 +1,12 @@ --- layout: default -title: File Upload +title: Action File Upload parent: title: Action File Upload Interceptor url: action-file-upload-interceptor --- -# File Upload +# Action File Upload {:.no_toc} * Will be replaced with the ToC, excluding a header @@ -24,14 +24,11 @@ than the temporary directory and the directories that belong to your web applica The Struts 2 framework leverages the Commons FileUpload library as a based library to support file upload in the framework. The library is included in a base Struts 2 distribution. -> NOTE: Since Struts 6.4.0 the `FileUploadInterceptor` is deprecated, and you should use `ActionFileUploadInterceptor` instead! - ## Basic Usage -The `org.apache.struts2.interceptor.FileUploadInterceptor` and `org.apache.struts2.interceptor.ActionFileUploadInterceptor` -interceptors are included as part of the `defaultStack` and named appropriately: `fileUpload` and `actionFileUpload`. -As long as the required libraries are added to your project you will be able to take advantage of the Struts 2 file upload -capability. Configure an Action mapping for your Action class as you typically would. +The `org.apache.struts2.interceptor.ActionFileUploadInterceptor` interceptor is included as part of the `defaultStack` +and named `actionFileUpload`. As long as the required libraries are added to your project you will be able to take +advantage of the Struts 2 file upload capability. Configure an Action mapping for your Action class as you typically would. ### Example action mapping: @@ -84,55 +81,6 @@ public class UploadAction extends ActionSupport implements UploadedFilesAware { } ``` -**Deprecated approach**: the fileUpload interceptor will use setter injection to insert the uploaded file and related data into your Action -class. For a form field named `upload` you would provide the three setter methods shown in the following example: - -### Example Action class: - -```java -package com.example; - -import java.io.File; - -import com.opensymphony.xwork2.ActionSupport; - -public class UploadAction extends ActionSupport { -private File file; -private String contentType; -private String filename; - -@StrutsParameter -public void setUpload(File file) { -this.file = file; -} - -@StrutsParameter -public void setUploadContentType(String contentType) { -this.contentType = contentType; -} - -@StrutsParameter -public void setUploadFileName(String filename) { -this.filename = filename; -} - -public String execute() { -//... -return SUCCESS; -} -} -``` - -The purpose of each one of these methods is described in the table below. Notice that if you have multiple file form -elements with different names you would be required to have another corresponding set of these methods for each file -uploaded. - -| Method Signature | Description | -|---|---
(struts-site) branch asf-staging updated: Updates stage by Jenkins
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/struts-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 26bb2d7fc Updates stage by Jenkins 26bb2d7fc is described below commit 26bb2d7fc6b5f3be3cc57b502913c6e5417f3092 Author: jenkins AuthorDate: Sat Mar 16 15:52:09 2024 + Updates stage by Jenkins --- .../action-file-upload-interceptor.html| 2 +- .../{file-upload.html => action-file-upload.html} | 218 ++--- content/core-developers/file-upload.html | 50 + 3 files changed, 23 insertions(+), 247 deletions(-) diff --git a/content/core-developers/action-file-upload-interceptor.html b/content/core-developers/action-file-upload-interceptor.html index 310dffc9d..7f8b86562 100644 --- a/content/core-developers/action-file-upload-interceptor.html +++ b/content/core-developers/action-file-upload-interceptor.html @@ -156,7 +156,7 @@ Available since Struts 6.4.0 as replacement for File Upload Interceptor -See this page for more examples and advanced configuration. +See this page for more examples and advanced configuration. Interceptor that is based off of MultiPartRequestWrapper, which is automatically applied for any request that includes a file. If an action implements org.apache.struts2.action.UploadedFilesAware interface, the interceptor will pass diff --git a/content/core-developers/file-upload.html b/content/core-developers/action-file-upload.html similarity index 61% copy from content/core-developers/file-upload.html copy to content/core-developers/action-file-upload.html index b3e1253f5..f6e1d9988 100644 --- a/content/core-developers/file-upload.html +++ b/content/core-developers/action-file-upload.html @@ -7,7 +7,7 @@ - File Upload + Action File Upload @@ -146,23 +146,21 @@ -https://github.com/apache/struts-site/edit/master/source/core-developers/file-upload.md"; title="Edit this page on GitHub">Edit on GitHub +https://github.com/apache/struts-site/edit/master/source/core-developers/action-file-upload.md"; title="Edit this page on GitHub">Edit on GitHub << back to Action File Upload Interceptor -File Upload +Action File Upload Dependencies Basic Usage Example action mapping: Example JSP form tags: - Example Action class: Uploading Multiple Files Uploading Multiple Files using Arrays - Uploading Multiple Files using Lists Advanced Configuration @@ -191,16 +189,11 @@ than the temporary directory and the directories that belong to your web applica The Struts 2 framework leverages the Commons FileUpload library as a based library to support file upload in the framework. The library is included in a base Struts 2 distribution. - - NOTE: Since Struts 6.4.0 the FileUploadInterceptor is deprecated, and you should use ActionFileUploadInterceptor instead! - - Basic Usage -The org.apache.struts2.interceptor.FileUploadInterceptor and org.apache.struts2.interceptor.ActionFileUploadInterceptor -interceptors are included as part of the defaultStack and named appropriately: fileUpload and actionFileUpload. -As long as the required libraries are added to your project you will be able to take advantage of the Struts 2 file upload -capability. Configure an Action mapping for your Action class as you typically would. +The org.apache.struts2.interceptor.ActionFileUploadInterceptor interceptor is included as part of the defaultStack +and named actionFileUpload. As long as the required libraries are added to your project you will be able to take +advantage of the Struts 2 file upload capability. Configure an Action mapping for your Action class as you typically would. Example action mapping: @@ -250,71 +243,6 @@ information and content of uploaded file. Your action should implement the inter } -Deprecated approach: the fileUpload interceptor will use setter injection to insert the uploaded file and related data into your Action -class. For a form field named upload you would provide the three setter methods shown in the following example: - -Example Action class: - -package com.example; - -import java.io.File; - -import com.opensymphony.xwork2.ActionSupport; - -public class UploadAction extends ActionSupport { -private File file; -private String contentType; -private String filename; - -@StrutsParameter -public void setUpload(File file) { -this.file = file; -} - -@StrutsParameter -public void setUploadContentType(String contentType) { -this.contentType = contentType; -} - -@StrutsParameter -public void setUploadFileName(String filename) { -this.filename = filename; -} - -public String execute() { -//... -return SUCCESS; -