You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/08/29 06:05:55 UTC
svn commit: r264054 - in /beehive/trunk/netui/test/webapps/drt:
coreWeb/mockportal/ coreWeb/mockportal/unwrapmultipart/ testRecorder/config/
Author: rich
Date: Sun Aug 28 21:05:45 2005
New Revision: 264054
URL: http://svn.apache.org/viewcvs?rev=264054&view=rev
Log:
This is a contribution from Carlin Rogers -- a manual test for http://issues.apache.org/jira/browse/BEEHIVE-882 : ScopedServletUtils.getOuterRequest() does not handle an instance of MultipartRequestWrapper
BB: self (linux)
Added:
beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/
beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/Controller.jpf (with props)
beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/form.jsp (with props)
beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/index.jsp (with props)
Modified:
beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/index.jsp
beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified: beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/index.jsp?rev=264054&r1=264053&r2=264054&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/index.jsp Sun Aug 28 21:05:45 2005
@@ -16,6 +16,7 @@
<netui:anchor href="listenTo/ListenToPortal.jsp">tests "listenTo" and exception-handling</netui:anchor><br>
<netui:anchor href="scoping/ScopingController.jpf">tests "jpfScopeID" parameter in portlets</netui:anchor><br>
<netui:anchor href="scoping2/ScopingController.jpf">tests "jpfScopeID" parameter in portlets using netui:anchor tag to launch popup</netui:anchor><br>
+<netui:anchor href="unwrapmultipart/index.jsp">test ScopedServletUtils.getOuterRequest() with a MultipartRequestWrapper</netui:anchor><br>
</body>
</html>
Added: beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/Controller.jpf?rev=264054&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/Controller.jpf (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/Controller.jpf Sun Aug 28 21:05:45 2005
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package mockportal.unwrapmultipart;
+
+import org.apache.beehive.netui.pageflow.FormData;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
+import org.apache.struts.upload.FormFile;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Jpf.Controller()
+public class Controller extends PageFlowController
+{
+
+ @Jpf.Action
+ (
+ forwards = { @Jpf.Forward(name = "success", path = "form.jsp") }
+ )
+ protected Forward begin()
+ {
+ return new Forward( "success" );
+ }
+
+ @Jpf.Action
+ (
+ forwards = { @Jpf.Forward(name = "success", path = "form.jsp") }
+ )
+ protected Forward getFile( TestUploadForm form )
+ {
+ HttpServletRequest request = getRequest();
+ HttpServletRequest outerRequest = ScopedServletUtils.getOuterRequest( request );
+ outerRequest.setAttribute( "testAttr", "testAttrValue" );
+ //System.out.println("$$$ pageflow outerRequest: " + outerRequest);
+
+ return new Forward( "success" );
+ }
+
+ public static class TestUploadForm extends FormData
+ {
+ protected FormFile file;
+
+ public FormFile getFile()
+ {
+ return file;
+ }
+ public void setFile(FormFile f)
+ {
+ file = f;
+ }
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/form.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/form.jsp?rev=264054&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/form.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/form.jsp Sun Aug 28 21:05:45 2005
@@ -0,0 +1,38 @@
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0" %>
+
+<br/>
+testAttr value: <%= (String) request.getAttribute( "testAttr" ) %>
+<br/>
+<br/>
+<br/>
+Multipart Request:
+<br/>
+<netui:form action="getFile" enctype="multipart/form-data" >
+ <table>
+
+ <tr>
+ <td>File:</td>
+ <td><netui:fileUpload dataSource="actionForm.file" size="25" /></td>
+ </tr>
+ <tr align="center">
+ <td colspan="2">
+ <button type="submit">Submit</button>
+ </td>
+ </tr>
+ </table>
+</netui:form>
+
+
+"Regular" request:
+<br/>
+<netui:form action="getFile" >
+ <table>
+ <tr align="center">
+ <td colspan="2">
+ <button type="submit">Submit</button>
+ </td>
+ </tr>
+ </table>
+</netui:form>
+
+
Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/form.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/index.jsp?rev=264054&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/index.jsp Sun Aug 28 21:05:45 2005
@@ -0,0 +1,22 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="mockportal.tld" prefix="mp" %>
+
+<html>
+<head>
+<title>Mock Portal - MultipartRequestWrapper Test</title>
+</head>
+
+<h3>Mock Portal - MultipartRequestWrapper Test</h3>
+<body>
+
+ <mp:mockPortal>
+ <mp:mockPortlet portletID="formA" pageFlowURI="/mockportal/unwrapmultipart/Controller.jpf" verbose="false" />
+ </mp:mockPortal>
+
+ <br/>
+ Get attribute from the outer request:
+ <br/>
+ testAttr value: <%= (String) request.getAttribute( "testAttr" ) %>
+
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/mockportal/unwrapmultipart/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=264054&r1=264053&r2=264054&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Sun Aug 28 21:05:45 2005
@@ -5047,6 +5047,17 @@
</features>
</test>
<test>
+ <name>MockPortalMultipart</name>
+ <description>Test ScopedServletUtils.getOuterRequest() to make sure it can handle a MultipartRequestWrapper (BEEHIVE-882)... for now this is a MANUAL test until testRecorder can handle multipart requests (BEEHIVE-483)</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>manualTests</category>
+ </categories>
+ <features>
+ <feature>Scoping</feature>
+ </features>
+ </test>
+ <test>
<name>MockPortalPopupWindows</name>
<description>Test of popup window support (really, a test of generating the right javascript) in MockPortal.</description>
<webapp>coreWeb</webapp>