Author: rgoers Date: Sat Nov 27 22:26:04 2004 New Revision: 106794 URL: http://svn.apache.org/viewcvs?view=rev&rev=106794 Log: Portal: fix bug 32417. Required attributes were not set for local JSR-168 portlets.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java cocoon/branches/BRANCH_2_1_X/status.xml Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java?view=diff&rev=106794&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java&r1=106793&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java&r2=106794 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java Sat Nov 27 22:26:04 2004 @@ -47,7 +47,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: LocalPortletInvokerImpl.java,v 1.4 2004/03/05 13:02:14 bdelacretaz Exp $ + * @version CVS $Id$ */ public class LocalPortletInvokerImpl extends AbstractLogEnabled @@ -137,7 +137,20 @@ if ( this.portlet == null ) { throw new PortletException("Unable to instantiate portlet from class " + this.portletDefinition.getClassName()); } - this.portlet.render(request, response); + try + { + request.setAttribute(org.apache.pluto.Constants.METHOD_ID, + org.apache.pluto.Constants.METHOD_RENDER); + request.setAttribute(org.apache.pluto.Constants.PORTLET_REQUEST, request); + request.setAttribute(org.apache.pluto.Constants.PORTLET_RESPONSE, + response); + this.portlet.render(request, response); + } finally { + request.removeAttribute(org.apache.pluto.Constants.METHOD_ID); + request.removeAttribute(org.apache.pluto.Constants.PORTLET_REQUEST); + request.removeAttribute(org.apache.pluto.Constants.PORTLET_RESPONSE); + } + } /* (non-Javadoc) Modified: cocoon/branches/BRANCH_2_1_X/status.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=106794&p1=cocoon/branches/BRANCH_2_1_X/status.xml&r1=106793&p2=cocoon/branches/BRANCH_2_1_X/status.xml&r2=106794 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Sat Nov 27 22:26:04 2004 @@ -202,6 +202,10 @@ <changes> <release version="@version@" date="@date@"> + <action dev="RG" type="fix" fixes-bug="32417"> + Portal: attributes "javax.portlet.request" and "javax.portlet.response" were not set for JSR-168 + portlets running in the Cocoon webapp. + </action> <action dev="RP" type="add"> cForms: added HTMLCleaning convertor (taken from Outerthought's Daisy) that cleans up the result by HTMLArea fields. The cleanup process, that is based upon
