svn commit: r1538540 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/dispatcher/Dispatcher.java main/resources/struts-default.xml test/java/org/apache/struts2/dispatcher/DispatcherTest.java

[lukaszlenart]

Author: lukaszlenart
Date: Mon Nov  4 09:56:12 2013
New Revision: 1538540

URL: http://svn.apache.org/r1538540
Log:
Uses name "jakarta" instead of default name for bean MultiPartRequest

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
    struts/struts2/trunk/core/src/main/resources/struts-default.xml
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java

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=1538540&r1=1538539&r2=1538540&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
 Mon Nov  4 09:56:12 2013
@@ -145,7 +145,7 @@ public class Dispatcher {
     private String multipartSaveDir;
 
     /**
-     * Stores the value of StrutsConstants.STRUTS_MULTIPART_HANDLER setting
+     * Stores the value of {@link StrutsConstants#STRUTS_MULTIPART_PARSER} 
setting
      */
     private String multipartHandlerName;
 

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=1538540&r1=1538539&r2=1538540&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Mon Nov  4 
09:56:12 2013
@@ -61,7 +61,7 @@
     <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" 
name="restful" class="org.apache.struts2.dispatcher.mapper.RestfulActionMapper" 
/>
     <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" 
name="restful2" 
class="org.apache.struts2.dispatcher.mapper.Restful2ActionMapper" />
 
-    <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"/>
 
     <bean type="org.apache.struts2.views.TagLibrary" name="s" 
class="org.apache.struts2.views.DefaultTagLibrary" />
 

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java?rev=1538540&r1=1538539&r2=1538540&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/DispatcherTest.java
 Mon Nov  4 09:56:12 2013
@@ -36,12 +36,15 @@ import com.opensymphony.xwork2.util.Loca
 import org.apache.struts2.StrutsConstants;
 import org.apache.struts2.StrutsTestCase;
 import 
org.apache.struts2.dispatcher.FilterDispatcherTest.InnerDestroyableObjectFactory;
+import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -134,6 +137,19 @@ public class DispatcherTest extends Stru
         assertEquals("utf-8", req.getCharacterEncoding());
     }
     
+    public void testPrepareMultipartRequest() throws Exception {
+        MockHttpServletRequest req = new MockHttpServletRequest();
+        MockHttpServletResponse res = new MockHttpServletResponse();
+        ServletContext ctx = new MockServletContext();
+
+        req.setContentType("multipart/form-data");
+        Dispatcher du = initDispatcher(Collections.<String, String>emptyMap());
+        du.prepare(req, res);
+        HttpServletRequest wrapped = du.wrapRequest(req, ctx);
+
+        assertTrue(wrapped instanceof MultiPartRequestWrapper);
+    }
+
     public void testDispatcherListener() throws Exception {
        
        final DispatcherListenerState state = new DispatcherListenerState();