[portal-commits] JBoss Portal SVN: r9028 - modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test.

[portal-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2007-11-19 18:54:15 -0500 (Mon, 19 Nov 2007)
New Revision: 9028

Modified:
   modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletControllerContextImpl.java
Log:
update portlet container 1.0.x to latest changes in web module

Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletControllerContextImpl.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletControllerContextImpl.java	2007-11-19 23:49:13 UTC (rev 9027)
+++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletControllerContextImpl.java	2007-11-19 23:54:15 UTC (rev 9028)
@@ -23,7 +23,8 @@
 package org.jboss.portal.portlet.test;
 
 import org.jboss.portal.web.IllegalRequestException;
-import org.jboss.portal.web.RequestInfo;
+import org.jboss.portal.web.WebRequest;
+import org.jboss.portal.web.Body;
 import org.jboss.portal.portlet.test.url.ParameterDecoder;
 import org.jboss.portal.common.util.ParameterMap;
 import org.jboss.portal.common.util.Tools;
@@ -69,7 +70,7 @@
       {
          targetId = StringCodec.decode(pathInfo.substring(1));
 
-         RequestInfo ri = new RequestInfo(req);
+         WebRequest ri = new WebRequest(req);
          ParameterDecoder decoder = PortletURLRenderer.builder.createDecoder();
          decoder.decode(ri.getQueryParameterMap());
 
@@ -108,13 +109,21 @@
          //
          PortletController.Request request;
          String type = metaParameters.getValue("type");
+
+         //
+         ParameterMap formParameters = null;
+         if (ri.getBody() instanceof Body.Form)
+         {
+            formParameters = ((Body.Form)ri.getBody()).getParameters();
+         }
+
          if ("action".equals(type))
          {
-            request = new PortletController.Action(targetId, actualParameters, ri.getBodyParameterMap(), mode, windowState);
+            request = new PortletController.Action(targetId, actualParameters, formParameters, mode, windowState);
          }
          else
          {
-            request = new PortletController.Render(targetId, actualParameters, ri.getBodyParameterMap(), mode, windowState);
+            request = new PortletController.Render(targetId, actualParameters, formParameters, mode, windowState);
          }
 
          //