You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2005/02/04 18:25:20 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker ServletPortletInvoker.java
ate 2005/02/04 09:25:20
Modified: portal/src/java/org/apache/jetspeed/container/invoker
ServletPortletInvoker.java
Log:
Correct the ContainerConstants.PORTAL_CONTEXT request attribute ("org.apache.jetspeed.request.context")
which after http://issues.apache.org/jira/browse/JS2-203 incorrectly pointed to the Portlet contextPath instead of the Jetspeed contextPath.
Revision Changes Path
1.18 +5 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
Index: ServletPortletInvoker.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServletPortletInvoker.java 4 Jan 2005 16:11:20 -0000 1.17
+++ ServletPortletInvoker.java 4 Feb 2005 17:25:20 -0000 1.18
@@ -31,14 +31,15 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.ContainerConstants;
import org.apache.jetspeed.container.PortletContextFactory;
import org.apache.jetspeed.factory.JetspeedPortletFactoryProxy;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.core.impl.PortletConfigImpl;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.servlet.WebApplicationDefinition;
@@ -206,7 +207,8 @@
servletRequest.setAttribute(ContainerConstants.PORTLET_REQUEST, portletRequest);
servletRequest.setAttribute(ContainerConstants.PORTLET_RESPONSE, portletResponse);
servletRequest.setAttribute(ContainerConstants.PORTLET_CONFIG, portletConfig);
- servletRequest.setAttribute(ContainerConstants.PORTAL_CONTEXT, ((HttpServletRequest)servletRequest).getContextPath());
+ RequestContext requestContext = (RequestContext)servletRequest.getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE);
+ servletRequest.setAttribute(ContainerConstants.PORTAL_CONTEXT, requestContext.getRequest().getContextPath());
JetspeedPortletFactoryProxy.setCurrentPortletDefinition(portletDefinition);
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org