Author: julien(a)jboss.com Date: 2008-04-18 08:32:38 -0400 (Fri, 18 Apr 2008) New Revision: 10645 Added: 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/ControllerRequestParameterMapFactory.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterNames.java Removed: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ Modified: modules/portlet/trunk/build/pom.xml modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.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: uncommited change Modified: modules/portlet/trunk/build/pom.xml =================================================================== --- modules/portlet/trunk/build/pom.xml 2008-04-18 12:05:32 UTC (rev 10644) +++ modules/portlet/trunk/build/pom.xml 2008-04-18 12:32:38 UTC (rev 10645) @@ -33,7 +33,7 @@ <version.jboss-logging>2.0.3.GA</version.jboss-logging> <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.Beta3</version.jboss.portal.common> + <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.unit>1.2.0.Beta2</version.jboss.unit> <version.log4j>1.2.14</version.log4j> Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java (from rev 10614, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestFactory.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java 2008-04-18 12:32:38 UTC (rev 10645) @@ -0,0 +1,199 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.impl; + +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.request.ControllerRequest; +import org.jboss.portal.portlet.controller.request.PortletActionRequest; +import org.jboss.portal.portlet.controller.request.PortletRenderRequest; +import org.jboss.portal.portlet.controller.request.PortletResourceRequest; +import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.ParametersStateString; +import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.common.util.Base64; +import org.jboss.portal.common.util.MapAdapters; +import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.common.io.SerializationFilter; +import org.jboss.portal.common.io.Serialization; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.web.WebRequest; +import org.jboss.portal.web.Body; + +import java.util.Map; + +/** + * A factory that provides a way to create ControllerRequest. This factory is just a default implementation + * and is not an authority which means that any client of the controller framework is free to determine how + * a controller request is created. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class ControllerRequestFactory +{ + + /** . */ + private final Serialization<PortletPageNavigationalState> serialization; + + public ControllerRequestFactory(Serialization<PortletPageNavigationalState> serialization) + { + this.serialization = serialization; + } + + /** + * Create a controller request. + * + * @param req the web request + * @return the decoded controller request + */ + public ControllerRequest decode(WebRequest req) + { + Map<String, String[]> bodyParameters = null; + + // + Body body = req.getBody(); + if (body instanceof Body.Form) + { + bodyParameters = ((Body.Form)body).getParameters(); + } + + // + return decode(req.getQueryParameterMap(), bodyParameters); + } + + /** + * Create a controller request. + * + * @param queryParameterMap the query parameter map + * @param formParameterMap the optional form parameter map + * @return the decoded controller request + */ + public ControllerRequest decode(Map<String, String[]> queryParameterMap, Map<String, String[]> formParameterMap) + { + Map<String, String> queryParameters = MapAdapters.adapt(queryParameterMap); + + // The nav state provided with the request + // Unmarshall portal navigational state if it is provided + PortletPageNavigationalState pageNavigationalState = null; + String context = queryParameters.get(ControllerRequestParameterNames.PAGE_NAVIGATIONAL_STATE); + if (context != null) + { + byte[] bytes = Base64.decode(context, true); + pageNavigationalState = IOTools.unserialize(serialization, SerializationFilter.COMPRESSOR, bytes); + } + + // Get the window id + String windowId = queryParameters.get(ControllerRequestParameterNames.WINDOW_ID); + + // + Mode mode = null; + if (queryParameters.get(ControllerRequestParameterNames.MODE) != null) + { + mode = Mode.create(queryParameters.get(ControllerRequestParameterNames.MODE)); + } + + // + WindowState windowState = null; + if (queryParameters.get(ControllerRequestParameterNames.WINDOW_STATE) != null) + { + windowState = WindowState.create(queryParameters.get(ControllerRequestParameterNames.WINDOW_STATE)); + } + + // + String navigationalStateString = queryParameters.get(ControllerRequestParameterNames.NAVIGATIONAL_STATE); + StateString navigationalState = null; + if (navigationalStateString != null) + { + navigationalState = ParametersStateString.create(navigationalStateString); + } + + // + PortletWindowNavigationalState windowNavigationalState = new PortletWindowNavigationalState(navigationalState, mode, windowState); + + // + String phase = queryParameters.get(ControllerRequestParameterNames.LIFECYCLE_PHASE); + if (ControllerRequestParameterNames.RESOURCE_PHASE.equals(phase)) + { + StateString resourceState = ParametersStateString.create(queryParameters.get(ControllerRequestParameterNames.RESOURCE_STATE)); + String resourceId = queryParameters.get(ControllerRequestParameterNames.RESOURCE_ID); + + // + CacheLevel resourceCacheLevel = CacheLevel.valueOf(queryParameters.get(ControllerRequestParameterNames.RESOURCE_CACHEABILITY)); + + // + PortletResourceRequest.Scope scope; + switch (resourceCacheLevel) + { + case FULL: + scope = new PortletResourceRequest.FullScope(); + break; + case PORTLET: + scope = new PortletResourceRequest.PortletScope(windowNavigationalState); + break; + case PAGE: + scope = new PortletResourceRequest.PageScope(windowNavigationalState, pageNavigationalState); + break; + default: + throw new AssertionError(); + } + + // + return new PortletResourceRequest( + windowId, + resourceId, + resourceState, + formParameterMap, + scope); + } + else + { + if (ControllerRequestParameterNames.ACTION_PHASE.equals(phase)) + { + StateString interactionState = ParametersStateString.create(queryParameters.get(ControllerRequestParameterNames.INTERACTION_STATE)); + + // + return new PortletActionRequest( + windowId, + interactionState, + formParameterMap, + windowNavigationalState, + pageNavigationalState); + } + else + { + byte[] bytes = Base64.decode(queryParameters.get(ControllerRequestParameterNames.PUBLIC_NAVIGATIONAL_STATE_CHANGES), true); + Map<String, String[]> publicNavigationalStateChanges = IOTools.unserialize(Serialization.PARAMETER_MAP, SerializationFilter.COMPRESSOR, bytes); + + // + return new PortletRenderRequest( + windowId, + windowNavigationalState, + publicNavigationalStateChanges, + pageNavigationalState); + } + } + } + +} Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterMapFactory.java (from rev 10614, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestParameterMapFactory.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterMapFactory.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterMapFactory.java 2008-04-18 12:32:38 UTC (rev 10645) @@ -0,0 +1,196 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.impl; + +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.ContainerURL; +import org.jboss.portal.portlet.ActionURL; +import org.jboss.portal.portlet.RenderURL; +import org.jboss.portal.portlet.ResourceURL; +import org.jboss.portal.portlet.PortletURL; +import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.common.io.SerializationFilter; +import org.jboss.portal.common.io.Serialization; +import org.jboss.portal.common.util.Base64; + +import java.util.Map; +import java.util.HashMap; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class ControllerRequestParameterMapFactory +{ + + /** . */ + private final Serialization<PortletPageNavigationalState> serialization; + + public ControllerRequestParameterMapFactory(Serialization<PortletPageNavigationalState> serialization) + { + this.serialization = serialization; + } + + public Map<String, String> encode(PortletPageNavigationalState pageNS, String windowId, ContainerURL containerURL) + { + Map<String, String> parameters = new HashMap<String, String>(); + + // + parameters.put(ControllerRequestParameterNames.WINDOW_ID, windowId); + + // + String type; + if (containerURL instanceof ActionURL) + { + type = ControllerRequestParameterNames.ACTION_PHASE; + } + else if (containerURL instanceof RenderURL) + { + type = ControllerRequestParameterNames.RENDER_PHASE; + } + else if (containerURL instanceof ResourceURL) + { + type = ControllerRequestParameterNames.RESOURCE_PHASE; + } + else + { + throw new Error(); + } + parameters.put(ControllerRequestParameterNames.LIFECYCLE_PHASE, type); + + + // + String pageNavigationalState = null; + if (pageNS != null) + { + byte[] bytes = IOTools.serialize(serialization, SerializationFilter.COMPRESSOR, pageNS); + pageNavigationalState = Base64.encodeBytes(bytes, true); + } + + // + if (containerURL instanceof PortletURL) + { + PortletURL portletURL = (PortletURL)containerURL; + + if (portletURL.getMode() != null) + { + parameters.put(ControllerRequestParameterNames.MODE, portletURL.getMode().toString()); + } + + // + if (portletURL.getWindowState() != null) + { + parameters.put(ControllerRequestParameterNames.WINDOW_STATE, portletURL.getWindowState().toString()); + } + + // + if (pageNavigationalState != null) + { + parameters.put(ControllerRequestParameterNames.PAGE_NAVIGATIONAL_STATE, pageNavigationalState); + } + + // + if (containerURL instanceof ActionURL) + { + ActionURL actionURL = (ActionURL)containerURL; + + // + if (actionURL.getNavigationalState() != null) + { + parameters.put(ControllerRequestParameterNames.NAVIGATIONAL_STATE, actionURL.getNavigationalState().getStringValue()); + } + + // + StateString interactionState = actionURL.getInteractionState(); + parameters.put(ControllerRequestParameterNames.INTERACTION_STATE, interactionState.getStringValue()); + } + else + { + RenderURL renderURL = (RenderURL)containerURL; + + // + Map<String, String[]> changes = renderURL.getPublicNavigationalStateChanges(); + byte[] bytes = IOTools.serialize(Serialization.PARAMETER_MAP, SerializationFilter.COMPRESSOR, changes); + String ns = Base64.encodeBytes(bytes, true); + parameters.put(ControllerRequestParameterNames.PUBLIC_NAVIGATIONAL_STATE_CHANGES, ns); + + // + StateString navigationalState = renderURL.getNavigationalState(); + if (navigationalState != null) + { + parameters.put(ControllerRequestParameterNames.NAVIGATIONAL_STATE, navigationalState.getStringValue()); + } + } + } + else + { + ResourceURL resourceURL = (ResourceURL)containerURL; + + // + StateString resourceState = resourceURL.getResourceState(); + parameters.put(ControllerRequestParameterNames.RESOURCE_STATE, resourceState.getStringValue()); + + // + String resourceId = resourceURL.getResourceId(); + if (resourceId != null) + { + parameters.put(ControllerRequestParameterNames.RESOURCE_ID, resourceId); + } + + // + CacheLevel cacheability = resourceURL.getCacheability(); + parameters.put(ControllerRequestParameterNames.RESOURCE_CACHEABILITY, cacheability.name()); + + // + if (cacheability != CacheLevel.FULL) + { + if (resourceURL.getNavigationalState() != null) + { + parameters.put(ControllerRequestParameterNames.NAVIGATIONAL_STATE, resourceURL.getNavigationalState().getStringValue()); + } + + // + if (resourceURL.getMode() != null) + { + parameters.put(ControllerRequestParameterNames.MODE, resourceURL.getMode().toString()); + } + + // + if (resourceURL.getWindowState() != null) + { + parameters.put(ControllerRequestParameterNames.WINDOW_STATE, resourceURL.getWindowState().toString()); + } + + if (cacheability == CacheLevel.PAGE && pageNavigationalState != null) + { + parameters.put(ControllerRequestParameterNames.PAGE_NAVIGATIONAL_STATE, pageNavigationalState); + } + } + } + + // + return parameters; + } +} Copied: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterNames.java (from rev 10614, modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/request/ControllerRequestParameterNames.java) =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterNames.java (rev 0) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterNames.java 2008-04-18 12:32:38 UTC (rev 10645) @@ -0,0 +1,75 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.controller.impl; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class ControllerRequestParameterNames +{ + /** + * The life cycle type of the invocation. The values accepted are <code>ACTION_LIFECYCLE</code>, + * <code>RENDER_LIFECYCLE</code> and <code>RESOURCE_LIFECYCLE</code>. + */ + public static final String LIFECYCLE_PHASE = "phase"; + + /** The window id. */ + public static final String WINDOW_ID = "windowid"; + + /** The portlet mode. */ + public static final String MODE = "mode"; + + /** The window state. */ + public static final String WINDOW_STATE = "windowstate"; + + /** The portlet navigational state for any type of lifecycle. */ + public static final String NAVIGATIONAL_STATE = "navigationalstate"; + + /** The portlet resource state for lifecycle of type <code>RENDER_LIFECYCLE</code>. */ + public static final String RESOURCE_STATE = "resourcestate"; + + /** The portlet interaction state for lifecycle of type <code>ACTION_LIFECYCLE</code>. */ + public static final String INTERACTION_STATE = "interactionstate"; + + /** The page state for any kind of lifecycle. */ + public static final String PAGE_NAVIGATIONAL_STATE = "pagenavigationalstate"; + + /** The public navigational state changes of a portlet for lifecycle of type <code>RENDER_LIFECYCLE</code>. */ + public static final String PUBLIC_NAVIGATIONAL_STATE_CHANGES = "publicnavigationalstatechanges"; + + /** The resource id for lifecycle of type <code>RESOURCE_LIFECYCLE</code>. */ + public static final String RESOURCE_ID = "resourceid"; + + /** The resource cacheability for lifecycle of type <code>RESOURCE_LIFECYCLE</code>. */ + public static final String RESOURCE_CACHEABILITY = "resourcecacheability"; + + /** Denotes an action lifecycle operation. */ + public static final String ACTION_PHASE = "action"; + + /** Denotes a render lifecycle operation. */ + public static final String RENDER_PHASE = "render"; + + /** Denotes a resource lifecycle operation. */ + public static final String RESOURCE_PHASE = "resource"; +} Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java 2008-04-18 12:05:32 UTC (rev 10644) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java 2008-04-18 12:32:38 UTC (rev 10645) @@ -32,8 +32,8 @@ import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.URLFormat; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; -import org.jboss.portal.portlet.controller.impl.request.ControllerRequestParameterNames; -import org.jboss.portal.portlet.controller.impl.request.ControllerRequestParameterMapFactory; +import org.jboss.portal.portlet.controller.impl.ControllerRequestParameterNames; +import org.jboss.portal.portlet.controller.impl.ControllerRequestParameterMapFactory; import static org.jboss.portal.portlet.controller.impl.URLParameterConstants.*; import javax.servlet.http.HttpServletRequest; @@ -141,7 +141,7 @@ ControllerRequestParameterMapFactory factory = new ControllerRequestParameterMapFactory(serialization); // - Map<String, String> parameters = factory.blah(pageNS, windowId, containerURL); + Map<String, String> parameters = factory.encode(pageNS, windowId, containerURL); // parameters.put(TYPE, PORTLET_TYPE); 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 12:05:32 UTC (rev 10644) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-04-18 12:32:38 UTC (rev 10645) @@ -24,6 +24,7 @@ import org.jboss.portal.portlet.controller.impl.PortletURLRenderer; import org.jboss.portal.portlet.controller.impl.URLParameterConstants; +import org.jboss.portal.portlet.controller.impl.ControllerRequestFactory; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.URLFormat; @@ -34,9 +35,8 @@ import org.jboss.portal.portlet.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.request.PortletActionRequest; -import org.jboss.portal.portlet.controller.impl.request.ControllerRequestFactory; +import org.jboss.portal.portlet.controller.impl.ControllerRequestParameterNames; import org.jboss.portal.portlet.controller.request.ControllerRequest; -import org.jboss.portal.portlet.controller.impl.request.ControllerRequestParameterNames; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.PageUpdateResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; @@ -119,7 +119,7 @@ { WebRequest wr = new WebRequest(req); ControllerRequestFactory factory = new ControllerRequestFactory(context.getPageNavigationalStateSerialization()); - ControllerRequest request = factory.createRequest(wr); + ControllerRequest request = factory.decode(wr); 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 12:05:32 UTC (rev 10644) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2008-04-18 12:32:38 UTC (rev 10645) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test; import org.jboss.portal.portlet.controller.PortletController; -import org.jboss.portal.portlet.controller.impl.request.ControllerRequestFactory; +import org.jboss.portal.portlet.controller.impl.ControllerRequestFactory; import org.jboss.portal.portlet.controller.impl.URLParameterConstants; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; @@ -86,7 +86,7 @@ { WebRequest wr = new WebRequest(req); ControllerRequestFactory factory = new ControllerRequestFactory(context.getPageNavigationalStateSerialization()); - ControllerRequest request = factory.createRequest(wr); + ControllerRequest request = factory.decode(wr); // 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 12:05:32 UTC (rev 10644) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java 2008-04-18 12:32:38 UTC (rev 10645) @@ -26,10 +26,10 @@ import org.jboss.portal.portlet.test.controller.ControllerResponseRendererFactory; import org.jboss.portal.portlet.test.controller.PageRenderer; import org.jboss.portal.portlet.controller.impl.URLParameterConstants; +import org.jboss.portal.portlet.controller.impl.ControllerRequestFactory; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.request.ControllerRequest; -import org.jboss.portal.portlet.controller.impl.request.ControllerRequestFactory; import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.web.WebRequest; @@ -92,7 +92,7 @@ { WebRequest wr = new WebRequest(req); ControllerRequestFactory factory = new ControllerRequestFactory(context.getPageNavigationalStateSerialization()); - ControllerRequest request = factory.createRequest(wr); + ControllerRequest request = factory.decode(wr); // We must have one!!! TCKPortletPageNavigationalState tckPageNavigationalState = (TCKPortletPageNavigationalState)request.getPageNavigationalState();