Author: chris.laprun(a)jboss.com
Date: 2007-01-12 20:48:24 -0500 (Fri, 12 Jan 2007)
New Revision: 6005
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
Log:
- No need to remember the portlet context anymore in RequestProcessor.initInvocation with
Julien changes.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2007-01-13
01:42:19 UTC (rev 6004)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2007-01-13
01:48:24 UTC (rev 6005)
@@ -119,8 +119,8 @@
void initInvocation(StateString navigationalState, SecurityContext securityContext,
HTTPStreamInfo streamInfo, PortalContext portalContext,
UserContext userContext,
- WindowContext windowContext,
- org.jboss.portal.portlet.PortletContext portletContext)
+ WindowContext windowContext
+ )
{
PortletParameters parameters;
NamedString[] formParams = interactionParams.getFormParameters();
@@ -164,7 +164,7 @@
markupRequest.getCharacterSet(), markupRequest.getMimeType());
setInvocation(new ActionInvocation(actionContext));
actionContext.contextualize(invocation);
- invocation.setAttribute(PortletInvocation.REQUEST_SCOPE,
PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, portletContext);
+ invocation.setAttribute(PortletInvocation.REQUEST_SCOPE,
PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, portlet.getContext());
}
Object processResponse(PortletInvocationResponse response)
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2007-01-13
01:42:19 UTC (rev 6004)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2007-01-13
01:48:24 UTC (rev 6005)
@@ -111,8 +111,8 @@
void initInvocation(StateString navigationalState, SecurityContext securityContext,
HTTPStreamInfo streamInfo, PortalContext portalContext,
UserContext userContext,
- WindowContext windowContext,
- org.jboss.portal.portlet.PortletContext portletContext)
+ WindowContext windowContext
+ )
{
WSRPRenderContext renderContext = new WSRPRenderContext(navigationalState,
securityContext, streamInfo,
portalContext, userContext, instanceContext, windowContext,
@@ -121,7 +121,7 @@
setInvocation(new RenderInvocation(renderContext));
renderContext.contextualize(invocation);
- invocation.setAttribute(PortletInvocation.REQUEST_SCOPE,
PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, portletContext);
+ invocation.setAttribute(PortletInvocation.REQUEST_SCOPE,
PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE, portlet.getContext());
}
Object processResponse(PortletInvocationResponse response)
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2007-01-13
01:42:19 UTC (rev 6004)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RequestProcessor.java 2007-01-13
01:48:24 UTC (rev 6005)
@@ -141,8 +141,7 @@
WindowContext windowContext = createWindowContext(portletContext.getId(),
runtimeContext);
// prepare the invocation
- // TODO: must pass the portlet context since the retrieved portlet points to the
POP, not clones: is it expected?
- initInvocation(navigationalState, securityContext, streamInfo, portalContext,
userContext, windowContext, portletContext);
+ initInvocation(navigationalState, securityContext, streamInfo, portalContext,
userContext, windowContext);
}
abstract RegistrationContext getRegistrationContext();
@@ -161,7 +160,7 @@
abstract void initInvocation(StateString navigationalState, SecurityContext
securityContext,
HTTPStreamInfo streamInfo, PortalContext portalContext,
UserContext userContext,
- WindowContext windowContext,
org.jboss.portal.portlet.PortletContext portletContext);
+ WindowContext windowContext);
abstract Object processResponse(PortletInvocationResponse response);