diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index 2ac0e8425..067c7ad3a 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -169,10 +169,6 @@ ../plugins/oval/target/apidocs docs/struts2-plugins/struts2-oval-plugin/apidocs - - ../plugins/pell-multipart/target/apidocs - docs/struts2-plugins/struts2-pell-multipart-plugin/apidocs - ../plugins/plexus/target/apidocs docs/struts2-plugins/struts2-plexus-plugin/apidocs diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index 44cb68acf..829bdbd00 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -104,10 +104,6 @@ ../plugins/oval/target/apidocs docs/struts2-plugins/struts2-oval-plugin/apidocs - - ../plugins/pell-multipart/target/apidocs - docs/struts2-plugins/struts2-pell-multipart-plugin/apidocs - ../plugins/plexus/target/apidocs docs/struts2-plugins/struts2-plexus-plugin/apidocs diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java index 4c974087d..cacfb750a 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java @@ -18,15 +18,14 @@ */ package org.apache.struts2.dispatcher.multipart; -import jakarta.servlet.http.HttpServletRequest; - -import org.apache.struts2.dispatcher.LocalizedMessage; - -import java.io.File; import java.io.IOException; import java.util.Enumeration; import java.util.List; +import org.apache.struts2.dispatcher.LocalizedMessage; + +import jakarta.servlet.http.HttpServletRequest; + /** *

Abstract wrapper class HTTP requests to handle multi-part data.

*/ @@ -105,7 +104,7 @@ public interface MultiPartRequest { /** * Returns a list of error messages that may have occurred while processing the request. * If there are no errors, an empty list is returned. If the underlying implementation - * (ie: pell, cos, jakarta, etc) cannot support providing these errors, an empty list is + * (ie: cos, jakarta, etc) cannot support providing these errors, an empty list is * also returned. This list of errors is reported back to the * {@link MultiPartRequestWrapper}'s errors field. * diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java index 32778cd5f..c2871d423 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java @@ -37,7 +37,7 @@ import java.util.*; * *

* The struts.multipart.parser property should be set to jakarta for the - * Jakarta implementation, pell for the Pell implementation and cos for the Jason Hunter + * Jakarta implementation, and cos for the Jason Hunter * implementation. *

* diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties index 2654a78d9..4ce1f3e5a 100644 --- a/core/src/main/resources/org/apache/struts2/default.properties +++ b/core/src/main/resources/org/apache/struts2/default.properties @@ -62,7 +62,6 @@ struts.objectFactory.spring.enableAopSupport = false ### Parser to handle HTTP POST requests, encoded using the MIME-type multipart/form-data # struts.multipart.parser=cos -# struts.multipart.parser=pell # struts.multipart.parser=jakarta-stream struts.multipart.parser=jakarta ### Uses jakarta.servlet.context.tempdir by default