Author: julien(a)jboss.com Date: 2008-02-04 11:27:04 -0500 (Mon, 04 Feb 2008) New Revision: 9746 Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopePropagationToResourcePhaseTestCase.java Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java Log: implementation of request scoped action attributes for resource serving Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-02-04 16:04:08 UTC (rev 9745) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2008-02-04 16:27:04 UTC (rev 9746) @@ -136,7 +136,17 @@ private Object invoke(ResourceInvocation resourceInvocation) throws Exception, InvocationException { - return resourceInvocation.invokeNext(); + Conversation conversation = loadConversation(resourceInvocation); + + // + if (conversation != null) + { + return invokeWithConversation(conversation, resourceInvocation); + } + else + { + return resourceInvocation.invokeNext(); + } } private Conversation loadConversation(PortletInvocation invocation) Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopePropagationToResourcePhaseTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopePropagationToResourcePhaseTestCase.java (rev 0) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletcontext/ScopePropagationToResourcePhaseTestCase.java 2008-02-04 16:27:04 UTC (rev 9746) @@ -0,0 +1,115 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.test.portlet.jsr286.ext.portletcontext; + +import org.jboss.portal.unit.PortletTestCase; +import org.jboss.portal.unit.PortletTestContext; +import org.jboss.portal.unit.annotations.TestCase; +import org.jboss.portal.unit.actions.PortletRenderTestAction; +import org.jboss.portal.unit.actions.PortletActionTestAction; +import org.jboss.portal.unit.actions.PortletResourceTestAction; +import org.jboss.portal.test.portlet.framework.UTP1; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.response.EndTestResponse; +import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; +import static org.jboss.unit.api.Assert.*; + +import javax.portlet.Portlet; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.PortletException; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletRequest; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; +import javax.portlet.ResourceURL; +import java.io.IOException; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +@TestCase +public class ScopePropagationToResourcePhaseTestCase +{ + + /** . */ + private String scopeId; + + public ScopePropagationToResourcePhaseTestCase(PortletTestCase seq) + { + seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + assertNull(request.getParameter(PortletRequest.ACTION_SCOPE_ID)); + return new InvokeGetResponse(response.createActionURL().toString()); + } + }); + seq.bindAction(1, UTP1.ACTION_JOIN_POINT, new PortletActionTestAction() + { + protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException + { + assertNull(request.getParameter(PortletRequest.ACTION_SCOPE_ID)); + request.setAttribute("foo", "bar"); + } + }); + seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction() + { + protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException + { + scopeId = assertNotNull(request.getParameter(PortletRequest.ACTION_SCOPE_ID)); + Object bar = request.getAttribute("foo"); + assertEquals("bar", bar); + return new InvokeGetResponse(response.createResourceURL().toString()); + } + }); + seq.bindAction(2, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + assertEquals(scopeId, request.getParameter(PortletRequest.ACTION_SCOPE_ID)); + Object bar = request.getAttribute("foo"); + assertEquals("bar", bar); + + // + ResourceURL url = response.createResourceURL(); + url.setCacheability(ResourceURL.PORTLET); + return new InvokeGetResponse(url.toString()); + } + }); + seq.bindAction(3, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestAction() + { + protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException + { + assertEquals(scopeId, request.getParameter(PortletRequest.ACTION_SCOPE_ID)); + Object bar = request.getAttribute("foo"); + assertEquals("bar", bar); + + // + return new EndTestResponse(); + } + }); + } +} \ No newline at end of file