Author: lukaszlenart
Date: Sun Jan 27 19:48:59 2013
New Revision: 1439156
URL: http://svn.apache.org/viewvc?rev=1439156&view=rev
Log:
WW-3363 removes struts.multipart.handler and reference only to
struts.multipart.parser to be consistent with the docs
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=1439156&r1=1439155&r2=1439156&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
Sun Jan 27 19:48:59 2013
@@ -126,11 +126,6 @@ public final class StrutsConstants {
public static final String STRUTS_MULTIPART_SAVEDIR =
"struts.multipart.saveDir";
/**
- * The name of the bean that will handle multipart requests
- */
- public static final String STRUTS_MULTIPART_HANDLER =
"struts.multipart.handler";
-
- /**
* The org.apache.struts2.dispatcher.multipart.MultiPartRequest parser
implementation
* for a multipart request (file upload)
*/
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=1439156&r1=1439155&r2=1439156&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
Sun Jan 27 19:48:59 2013
@@ -139,9 +139,9 @@ public class Dispatcher {
private String multipartSaveDir;
/**
- * Stores the value of StrutsConstants.STRUTS_MULTIPART_HANDLER setting
+ * Stores reference to instance of {@link MultiPartRequest} implementation
defined by {@link StrutsConstants#STRUTS_MULTIPART_PARSER}
*/
- private String multipartHandlerName;
+ private MultiPartRequest multipartHandler;
/**
* Provide list of default configuration files.
@@ -252,9 +252,9 @@ public class Dispatcher {
multipartSaveDir = val;
}
- @Inject(StrutsConstants.STRUTS_MULTIPART_HANDLER)
- public void setMultipartHandler(String val) {
- multipartHandlerName = val;
+ @Inject
+ public void setMultipartHandler(MultiPartRequest multiPartRequest) {
+ this.multipartHandler = multiPartRequest;
}
@Inject
@@ -774,19 +774,8 @@ public class Dispatcher {
String content_type = request.getContentType();
if (content_type != null &&
content_type.contains("multipart/form-data")) {
- MultiPartRequest mpr = null;
- //check for alternate implementations of MultiPartRequest
- Set<String> multiNames =
getContainer().getInstanceNames(MultiPartRequest.class);
- for (String multiName : multiNames) {
- if (multiName.equals(multipartHandlerName)) {
- mpr = getContainer().getInstance(MultiPartRequest.class,
multiName);
- }
- }
- if (mpr == null ) {
- mpr = getContainer().getInstance(MultiPartRequest.class);
- }
LocaleProvider provider =
getContainer().getInstance(LocaleProvider.class);
- request = new MultiPartRequestWrapper(mpr, request,
getSaveDir(servletContext), provider);
+ request = new MultiPartRequestWrapper(multipartHandler, request,
getSaveDir(servletContext), provider);
} else {
request = new StrutsRequestWrapper(request);
}
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=1439156&r1=1439155&r2=1439156&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sun Jan 27
19:48:59 2013
@@ -52,7 +52,7 @@
<bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="struts"
class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest"
scope="default"/>
<bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="jakarta"
class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest"
scope="default" />
- <constant name="struts.multipart.handler" value="jakarta" />
+ <constant name="struts.multipart.parser" value="jakarta" />
<bean type="org.apache.struts2.views.TagLibrary" name="s"
class="org.apache.struts2.views.DefaultTagLibrary" />
