Author: julien(a)jboss.com Date: 2008-02-26 19:53:35 -0500 (Tue, 26 Feb 2008) New Revision: 10127 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/LifeCyclePhaseRequestAttributeTestCase.java Log: fix wrong resource serving life cycle phase request attribute and update test case accordingly Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-26 23:53:20 UTC (rev 10126) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-27 00:53:35 UTC (rev 10127) @@ -72,6 +72,7 @@ import javax.portlet.RenderResponse; import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; +import javax.portlet.PortletRequest; import javax.portlet.filter.PortletFilter; import javax.portlet.filter.ActionFilter; import javax.portlet.filter.EventFilter; @@ -462,28 +463,28 @@ { req = new ActionRequestImpl(this, (ActionInvocation)invocation); resp = new ActionResponseImpl((ActionInvocation)invocation, req); - phase = "ACTION_PHASE"; + phase = PortletRequest.ACTION_PHASE; chain = new FilterChainImpl<ActionFilter>(actionFilterList, ActionFilter.class); } else if (invocation instanceof RenderInvocation) { req = new RenderRequestImpl(this, (RenderInvocation)invocation); resp = new RenderResponseImpl((RenderInvocation)invocation, req); - phase = "RENDER_PHASE"; + phase = PortletRequest.RENDER_PHASE; chain = new FilterChainImpl<RenderFilter>(renderFilterList, RenderFilter.class); } else if (invocation instanceof EventInvocation) { req = new EventRequestImpl(this, (EventInvocation)invocation); resp = new EventResponseImpl((EventInvocation)invocation, req); - phase = "EVENT_PHASE"; + phase = PortletRequest.EVENT_PHASE; chain = new FilterChainImpl<EventFilter>(eventFilterList, EventFilter.class); } else if (invocation instanceof ResourceInvocation) { req = new ResourceRequestImpl(this, (ResourceInvocation)invocation); resp = new ResourceResponseImpl((ResourceInvocation)invocation, req); - phase = "RESOURCE_SERVING_PHASE"; + phase = PortletRequest.RESOURCE_PHASE; chain = new FilterChainImpl<ResourceFilter>(resourceFilterList, ResourceFilter.class); } else Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/LifeCyclePhaseRequestAttributeTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/LifeCyclePhaseRequestAttributeTestCase.java 2008-02-26 23:53:20 UTC (rev 10126) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/portletrequests/LifeCyclePhaseRequestAttributeTestCase.java 2008-02-27 00:53:35 UTC (rev 10127) @@ -70,7 +70,7 @@ { protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException { - assertEquals("ACTION_PHASE", request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); + assertEquals(PortletRequest.ACTION_PHASE, request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); // response.setEvent("Event", null); @@ -80,14 +80,14 @@ { protected void run(Portlet portlet, EventRequest request, EventResponse response, PortletTestContext context) throws PortletException, IOException { - assertEquals("EVENT_PHASE", request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); + assertEquals(PortletRequest.RENDER_PHASE, request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); } }); seq.bindAction(1, UTP6.RENDER_JOIN_POINT, new PortletRenderTestAction() { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws PortletException, IOException { - assertEquals("RENDER_PHASE", request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); + assertEquals(PortletRequest.RENDER_PHASE, request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); // return new InvokeGetResponse(response.createResourceURL().toString()); @@ -97,7 +97,7 @@ { protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException { - assertEquals("RESOURCE_SERVING_PHASE", request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); + assertEquals(PortletRequest.RESOURCE_PHASE, request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); // return new EndTestResponse();