Author: julien(a)jboss.com Date: 2008-02-04 21:52:01 -0500 (Mon, 04 Feb 2008) New Revision: 9758 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/Event.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/EventControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/ContainerRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/FullScopedCacheablePortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java Log: update controller to use notion of "window id" and not a portlet, in the case of the controller2 stuff we have indeed window id == portlet id, but a window id is really something used to designate the portlet + its surrounding context (window and instance). In general window id notion is more precise than portlet id Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletURLRenderer.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -33,6 +33,7 @@ import org.jboss.portal.portlet.RenderURL; import org.jboss.portal.portlet.ResourceURL; import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.cache.CacheLevel; import static org.jboss.portal.portlet.test.URLParameterConstants.*; import org.jboss.portal.portlet.test.controller.PageNavigationalState; @@ -51,7 +52,7 @@ { /** . */ - final Portlet portlet; + final String windowId; /** . */ final HttpServletRequest clientReq; @@ -64,12 +65,12 @@ public PortletURLRenderer( PageNavigationalState pageNS, - Portlet portlet, + String windowId, HttpServletRequest clientReq, HttpServletResponse clientResp) { this.pageNS = pageNS; - this.portlet = portlet; + this.windowId = windowId; this.clientReq = clientReq; this.clientResp = clientResp; } @@ -84,7 +85,7 @@ buffer.append(Integer.toString(clientReq.getServerPort())); buffer.append(clientReq.getContextPath()); buffer.append('/'); - buffer.append(StringCodec.encode(portlet.getContext().getId())); + buffer.append(StringCodec.encode(windowId)); // Map<String, String> parameters = new HashMap<String, String>(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageNavigationalState.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -25,6 +25,7 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.info.PortletInfo; import javax.xml.namespace.QName; import java.util.Map; @@ -68,10 +69,10 @@ return windows.get(windowId); } - public ParameterMap getPublicNavigationalState(Portlet portlet) + public ParameterMap getPublicNavigationalState(PortletInfo portlet) { ParameterMap publicNavigationalState = null; - for (ParameterInfo parameterInfo : portlet.getInfo().getNavigation().getPublicParameters()) + for (ParameterInfo parameterInfo : portlet.getNavigation().getPublicParameters()) { String[] parameterValue = page.get(parameterInfo.getName()); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContext.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -24,6 +24,7 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; @@ -51,7 +52,7 @@ HttpServletResponse getClientResponse(); - Portlet getPortlet(String portletId) throws PortletInvokerException; + PortletInfo getPortletInfo(String windowId) throws PortletInvokerException; // To be removed PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletRequestHandler.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -7,12 +7,11 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.info.NavigationInfo; import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.response.ErrorResponse; @@ -22,8 +21,6 @@ import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; import org.jboss.portal.portlet.test.PortletURLRenderer; import org.jboss.portal.portlet.test.TestPortletInvocationContext; -import org.jboss.portal.portlet.test.TestInstanceContext; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import static org.jboss.portal.portlet.test.controller.PortletController.*; import org.jboss.portal.portlet.test.controller.event.Event; import org.jboss.portal.portlet.test.controller.event.EventControllerContext; @@ -73,9 +70,6 @@ MutablePageNavigationalState pageState = portletRequest.getPageState() == null ? new MutablePageNavigationalState() : new MutablePageNavigationalState(portletRequest.getPageState()); // - PortletContext portletContext = portletRequest.getControllerContext().getPortlet(portletRequest.getPortletId()).getContext(); - - // ResponseProperties requestProperties = new ResponseProperties(); // @@ -87,7 +81,7 @@ { // Update portlet NS UpdateNavigationalStateResponse updateResponse = (UpdateNavigationalStateResponse)response; - updateNavigationalState(context, portletRequest.getPortletId(), updateResponse, pageState); + updateNavigationalState(context, portletRequest.getWindowId(), updateResponse, pageState); // ResponseProperties update = updateResponse.getProperties(); @@ -104,7 +98,7 @@ LinkedList<Event> eventQueue = new LinkedList<Event>(); for (UpdateNavigationalStateResponse.Event portletEvent : stateResponse.getEvents()) { - Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletContext); + Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletRequest.getWindowId()); List<Event> consumedEvents = eventCC.getConsumedEvents(producedEvent); eventQueue.addAll(consumedEvents); } @@ -123,12 +117,12 @@ UpdateNavigationalStateResponse eventStateResponse = (UpdateNavigationalStateResponse)eventResponse; // Update ns - updateNavigationalState(context, event.getPortletContext().getId(), eventStateResponse, pageState); + updateNavigationalState(context, event.getWindowId(), eventStateResponse, pageState); // Add events if any for (UpdateNavigationalStateResponse.Event portletEvent : eventStateResponse.getEvents()) { - Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletContext); + Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletRequest.getWindowId()); List<Event> consumedEvents = eventCC.getConsumedEvents(producedEvent); eventQueue.addAll(consumedEvents); } @@ -166,7 +160,7 @@ PortletInvocationResponse invoke(PortletRequest portletRequest) throws PortletInvokerException { PortletControllerContext context = portletRequest.getControllerContext(); - Portlet portlet = context.getPortlet(portletRequest.getPortletId()); + PortletInfo portlet = context.getPortletInfo(portletRequest.getWindowId()); HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); @@ -208,7 +202,7 @@ // ParameterMap publicNS = pageNS.getPublicNavigationalState(portlet); - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portletRequest.getWindowId(), req, resp); TestPortletInvocationContext portletInvocationContext = new TestPortletInvocationContext(renderer, MARKUP_INFO); ActionInvocation actionInvocation = new ActionInvocation(portletInvocationContext); @@ -221,7 +215,7 @@ actionInvocation.setForm(portletActionRequest.getBodyParameters() != null ? ParameterMap.clone(portletActionRequest.getBodyParameters()) : null); // - return context.invoke(portletRequest.getPortletId(), actionInvocation); + return context.invoke(portletRequest.getWindowId(), actionInvocation); } } @@ -229,11 +223,11 @@ PageNavigationalState pageNS, List<Cookie> requestCookies) throws PortletInvokerException { - Portlet portlet = context.getPortlet(event.getPortletContext().getId()); + PortletInfo portlet = context.getPortletInfo(event.getWindowId()); HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); - WindowNavigationalState windowNS = pageNS.getWindowNavigationalState(portlet.getContext().getId()); - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); + WindowNavigationalState windowNS = pageNS.getWindowNavigationalState(event.getWindowId()); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, event.getWindowId(), req, resp); // if (windowNS == null) @@ -257,17 +251,17 @@ eventInvocation.setPayload(event.getPayload()); // - return context.invoke(event.getPortletContext().getId(), requestCookies, eventInvocation); + return context.invoke(event.getWindowId(), requestCookies, eventInvocation); } - private void updateNavigationalState(PortletControllerContext context, String portletId, + private void updateNavigationalState(PortletControllerContext context, String windowId, UpdateNavigationalStateResponse update, MutablePageNavigationalState pageState) throws PortletInvokerException { - Portlet portlet = context.getPortlet(portletId); + PortletInfo portlet = context.getPortletInfo(windowId); // - WindowNavigationalState windowNS = pageState.getWindowNavigationalState(portletId); + WindowNavigationalState windowNS = pageState.getWindowNavigationalState(windowId); // if (windowNS == null) @@ -292,13 +286,13 @@ portletNS = update.getNavigationalState(); } windowNS = new WindowNavigationalState(portletNS, mode, windowState); - pageState.setWindowNavigationalState(portletId, windowNS); + pageState.setWindowNavigationalState(windowId, windowNS); // Now update shared state scoped at page Map<String, String[]> publicNS = update.getPublicNavigationalStateUpdates(); if (publicNS != null) { - NavigationInfo navigationInfo = portlet.getInfo().getNavigation(); + NavigationInfo navigationInfo = portlet.getNavigation(); for (Map.Entry<String, String[]> entry : publicNS.entrySet()) { String id = entry.getKey(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletResourceRequestHandler.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -29,13 +29,13 @@ import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.cache.CacheLevel; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.test.PortletURLRenderer; -import org.jboss.portal.portlet.test.controller.WindowNavigationalState; import org.jboss.portal.portlet.test.TestPortletInvocationContext; import static org.jboss.portal.portlet.test.controller.PortletController.*; import org.jboss.portal.portlet.test.controller.request.ControllerRequest; @@ -87,7 +87,7 @@ CacheLevel cacheability; PortletControllerContext context = portletResourceRequest.getControllerContext(); - Portlet portlet = context.getPortlet(portletResourceRequest.getPortletId()); + PortletInfo portlet = context.getPortletInfo(portletResourceRequest.getWindowId()); HttpServletRequest req = context.getClientRequest(); HttpServletResponse resp = context.getClientResponse(); @@ -133,7 +133,7 @@ } // - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portletResourceRequest.getWindowId(), req, resp); // TestPortletInvocationContext resourceInvocationContext = new TestPortletInvocationContext(renderer, MARKUP_INFO); @@ -152,7 +152,7 @@ // try { - return context.invoke(portletResourceRequest.getPortletId(), resourceInvocation); + return context.invoke(portletResourceRequest.getWindowId(), resourceInvocation); } catch (PortletInvokerException e) { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/Event.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/Event.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/Event.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -43,21 +43,21 @@ private final Serializable payload; /** . */ - private final PortletContext portletContext; + private final String windowId; - public Event(QName name, Serializable payload, PortletContext portletContext) + public Event(QName name, Serializable payload, String windowId) { if (name == null) { throw new IllegalArgumentException(); } - if (portletContext == null) + if (windowId == null) { throw new IllegalArgumentException(); } this.name = name; this.payload = payload; - this.portletContext = portletContext; + this.windowId = windowId; } public QName getName() @@ -70,8 +70,8 @@ return payload; } - public PortletContext getPortletContext() + public String getWindowId() { - return portletContext; + return windowId; } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/EventControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/EventControllerContextImpl.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/event/EventControllerContextImpl.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -56,7 +56,7 @@ PortletInfo portletInfo = portlet.getInfo(); if (portletInfo.getEventing().getConsumedEvents().containsKey(producedEvent.getName())) { - Event consumedEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), portlet.getContext()); + Event consumedEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), portlet.getContext().getId()); consumedEvents.add(consumedEvent); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/ContainerRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/ContainerRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/ContainerRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -32,18 +32,18 @@ { /** . */ - private final String portletId; + private final String windowId; - ContainerRequest(PortletControllerContext controllerContext, String portletId) + ContainerRequest(PortletControllerContext controllerContext, String windowId) { super(controllerContext); // - this.portletId = portletId; + this.windowId = windowId; } - public String getPortletId() + public String getWindowId() { - return portletId; + return windowId; } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/FullScopedCacheablePortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -35,11 +35,11 @@ public FullScopedCacheablePortletResourceRequest( PortletControllerContext controllerContext, - String portletId, + String windowId, String resourceId, StateString resourceState, ParameterMap bodyParameters) { - super(controllerContext, portletId, resourceId, resourceState, bodyParameters); + super(controllerContext, windowId, resourceId, resourceState, bodyParameters); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -40,14 +40,14 @@ public PageScopedFullPortletResourceRequest( PortletControllerContext controllerContext, - String portletId, + String windowId, String resourceId, StateString resourceState, ParameterMap bodyParameters, PageNavigationalState pageState, WindowNavigationalState windowNavigationalState) { - super(controllerContext, portletId, resourceId, resourceState, bodyParameters, windowNavigationalState); + super(controllerContext, windowId, resourceId, resourceState, bodyParameters, windowNavigationalState); // this.pageState = pageState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletActionRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -43,13 +43,13 @@ public PortletActionRequest( PortletControllerContext controllerContext, - String portletId, + String windowId, StateString interactionState, ParameterMap bodyParameters, WindowNavigationalState windowNavigationalState, PageNavigationalState pageState) { - super(controllerContext, portletId, windowNavigationalState, pageState); + super(controllerContext, windowId, windowNavigationalState, pageState); // this.interactionState = interactionState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRenderRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -40,12 +40,12 @@ public PortletRenderRequest( PortletControllerContext controllerContext, - String portletId, + String windowId, WindowNavigationalState windowNavigationalState, Map<String, String[]> publicNavigationalStateChanges, PageNavigationalState pageState) { - super(controllerContext, portletId, windowNavigationalState, pageState); + super(controllerContext, windowId, windowNavigationalState, pageState); // this.publicNavigationalStateChanges = publicNavigationalStateChanges; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -41,11 +41,11 @@ PortletRequest( PortletControllerContext controllerContext, - String portletId, + String windowId, WindowNavigationalState windowNavigationalState, PageNavigationalState pageState) { - super(controllerContext, portletId); + super(controllerContext, windowId); // this.windowNavigationalState = windowNavigationalState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletResourceRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletResourceRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -58,13 +58,13 @@ PortletResourceRequest( PortletControllerContext controllerContext, - String portletId, + String windowId, String resourceId, StateString resourceState, ParameterMap bodyParameters ) { - super(controllerContext, portletId); + super(controllerContext, windowId); // this.resourceId = resourceId; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/request/PortletScopedPortletResourceRequest.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -39,13 +39,13 @@ public PortletScopedPortletResourceRequest( PortletControllerContext controllerContext, - String portletId, + String windowId, String resourceId, StateString resourceState, ParameterMap bodyParameters, WindowNavigationalState windowNavigationalState) { - super(controllerContext, portletId, resourceId, resourceState, bodyParameters); + super(controllerContext, windowId, resourceId, resourceState, bodyParameters); // this.windowNavigationalState = windowNavigationalState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PageUpdateRenderer.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -174,7 +174,7 @@ } // - ParameterMap publicNS = pageState.getPublicNavigationalState(portlet); + ParameterMap publicNS = pageState.getPublicNavigationalState(portlet.getInfo()); RenderInvocation render = createRenderInvocation(context, properties, pageState, portlet, windowNS, mode, windowState, portletNS, publicNS); @@ -228,7 +228,7 @@ HttpServletResponse resp = context.getClientResponse(); // - PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet, req, resp); + PortletURLRenderer renderer = new PortletURLRenderer(pageNS, portlet.getContext().getId(), req, resp); // TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), false); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-05 02:33:07 UTC (rev 9757) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/PortletControllerContextImpl.java 2008-02-05 02:52:01 UTC (rev 9758) @@ -33,6 +33,7 @@ import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.impl.spi.AbstractClientContext; import org.jboss.portal.portlet.impl.spi.AbstractServerContext; import org.jboss.portal.portlet.impl.spi.AbstractUserContext; @@ -276,11 +277,16 @@ return resp; } - public Portlet getPortlet(String portletId) throws PortletInvokerException + public PortletInfo getPortletInfo(String windowId) throws PortletInvokerException { - return invoker.getPortlet(PortletContext.createPortletContext(portletId)); + return _getPortlet(windowId).getInfo(); } + private Portlet _getPortlet(String windowId) throws PortletInvokerException + { + return invoker.getPortlet(PortletContext.createPortletContext(windowId)); + } + public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException { return invoker.invoke(invocation); @@ -299,7 +305,7 @@ public PortletInvocationResponse invoke(String windowId, ActionInvocation actionInvocation) throws PortletInvokerException { - Portlet portlet = getPortlet(windowId); + Portlet portlet =_getPortlet(windowId); TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), true); @@ -318,7 +324,7 @@ public PortletInvocationResponse invoke(String windowId, List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException { - Portlet portlet = getPortlet(windowId); + Portlet portlet = _getPortlet(windowId); TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), true); @@ -336,7 +342,7 @@ public PortletInvocationResponse invoke(String windowId, ResourceInvocation resourceInvocation) throws PortletInvokerException { - Portlet portlet = getPortlet(windowId); + Portlet portlet = _getPortlet(windowId); TestInstanceContext instanceContext = new TestInstanceContext(req, portlet.getContext(), true);