Author: julien(a)jboss.com Date: 2008-04-18 11:04:47 -0400 (Fri, 18 Apr 2008) New Revision: 10647 Modified: modules/portlet/trunk/build/pom.xml modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java Log: use web snapshot into portlet module with the new endpoint feature Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-04-18 13:23:00 UTC (rev 10646) +++ modules/portlet/trunk/build/pom.xml 2008-04-18 15:04:47 UTC (rev 10647) @@ -34,7 +34,7 @@ <version.jbossxb>2.0.0.CR5</version.jbossxb> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common> - <version.jboss.portal.web>1.2.0.Beta3</version.jboss.portal.web> + <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web> <version.jboss.unit>1.2.0.Beta2</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java 2008-04-18 13:23:00 UTC (rev 10646) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java 2008-04-18 15:04:47 UTC (rev 10647) @@ -70,17 +70,28 @@ */ public ControllerRequest decode(WebRequest req) { + return decode(req.getQueryParameterMap(), req.getBody()); + } + + /** + * Create a controller request. + * + * @param queryParameters the query parameters + * @param body the body + * @return the decoded controller request + */ + public ControllerRequest decode(Map<String, String[]> queryParameters, Body body) + { Map<String, String[]> bodyParameters = null; // - Body body = req.getBody(); if (body instanceof Body.Form) { bodyParameters = ((Body.Form)body).getParameters(); } // - return decode(req.getQueryParameterMap(), bodyParameters); + return decode(queryParameters, bodyParameters); } /** Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-04-18 13:23:00 UTC (rev 10646) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-04-18 15:04:47 UTC (rev 10647) @@ -46,7 +46,7 @@ import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.io.SerializationFilter; import org.jboss.portal.common.util.Base64; -import org.jboss.portal.web.WebRequest; +import org.jboss.portal.web.util.RequestDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -117,10 +117,12 @@ PortletPageNavigationalState pageNavigationalState = null; if (URLParameterConstants.PORTLET_TYPE.equals(type)) { - WebRequest wr = new WebRequest(req); ControllerRequestFactory factory = new ControllerRequestFactory(context.getPageNavigationalStateSerialization()); - ControllerRequest request = factory.decode(wr); + RequestDecoder decoder = new RequestDecoder(req); + + ControllerRequest request = factory.decode(decoder.getQueryParameters(), decoder.getBody()); + ControllerResponse controllerResponse; try { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-04-18 13:23:00 UTC (rev 10646) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-04-18 15:04:47 UTC (rev 10647) @@ -34,21 +34,20 @@ import org.jboss.portal.portlet.test.controller.Renderer; import org.jboss.portal.portlet.test.controller.RendererContextImpl; import org.jboss.portal.web.WebRequest; +import org.jboss.portal.web.WebResponse; +import org.jboss.portal.web.endpoint.EndPointServlet; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public class PortalServlet extends HttpServlet +public class PortalServlet extends EndPointServlet { - protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + protected void service(WebRequest req, WebResponse resp) throws ServletException, IOException { try { @@ -72,7 +71,7 @@ } } - protected void _service(HttpServletRequest req, HttpServletResponse resp) throws Exception + protected void _service(WebRequest req, WebResponse resp) throws Exception { PortletControllerContextImpl context = new PortletControllerContextImpl(req, resp, getServletContext()); @@ -84,9 +83,8 @@ // if (URLParameterConstants.PORTLET_TYPE.equals(type)) { - WebRequest wr = new WebRequest(req); ControllerRequestFactory factory = new ControllerRequestFactory(context.getPageNavigationalStateSerialization()); - ControllerRequest request = factory.decode(wr); + ControllerRequest request = factory.decode(req); // ControllerResponse response = controller.process(context, request); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java 2008-04-18 13:23:00 UTC (rev 10646) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java 2008-04-18 15:04:47 UTC (rev 10647) @@ -33,10 +33,9 @@ import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.web.WebRequest; +import org.jboss.portal.web.WebResponse; +import org.jboss.portal.web.endpoint.EndPointServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServlet; import javax.servlet.ServletException; import java.io.IOException; import java.util.Collection; @@ -47,13 +46,13 @@ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -public class TCKServlet extends HttpServlet +public class TCKServlet extends EndPointServlet { /** . */ public static String TCK_PORTLET_NAME = "portletName"; - protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + protected void service(WebRequest req, WebResponse resp) throws ServletException, IOException { try { @@ -77,7 +76,7 @@ } } - protected void _service(HttpServletRequest req, HttpServletResponse resp) throws Exception + protected void _service(WebRequest req, WebResponse resp) throws Exception { TCKPortletControllerContext context = new TCKPortletControllerContext(req, resp, getServletContext()); @@ -90,9 +89,8 @@ // if (URLParameterConstants.PORTLET_TYPE.equals(type)) { - WebRequest wr = new WebRequest(req); ControllerRequestFactory factory = new ControllerRequestFactory(context.getPageNavigationalStateSerialization()); - ControllerRequest request = factory.decode(wr); + ControllerRequest request = factory.decode(req); // We must have one!!! TCKPortletPageNavigationalState tckPageNavigationalState = (TCKPortletPageNavigationalState)request.getPageNavigationalState();