You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2008/05/03 04:25:11 UTC
svn commit: r652971 -
/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
Author: ate
Date: Fri May 2 19:25:10 2008
New Revision: 652971
URL: http://svn.apache.org/viewvc?rev=652971&view=rev
Log:
fixing broken PortletInvoker usage, now deriving the target servletContext from the PortletRegistryService -> PortletContext
Modified:
portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java?rev=652971&r1=652970&r2=652971&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java Fri May 2 19:25:10 2008
@@ -43,6 +43,7 @@
import org.apache.pluto.RequiredContainerServices;
import org.apache.pluto.internal.InternalActionRequest;
import org.apache.pluto.internal.InternalActionResponse;
+import org.apache.pluto.internal.InternalPortletContext;
import org.apache.pluto.internal.InternalPortletRequest;
import org.apache.pluto.internal.InternalPortletResponse;
import org.apache.pluto.internal.InternalRenderRequest;
@@ -180,13 +181,16 @@
InternalRenderResponse renderResponse = getOptionalContainerServices().getPortletEnvironmentService()
.createRenderResponse(this, request, response, portletWindow);
+ String appId = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getId();
+ InternalPortletContext portletContext = optionalContainerServices.getPortletRegistryService().getPortletContext(appId);
+
PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
try {
ContainerInvocation.setInvocation(this, portletWindow);
//Filter initialisation
FilterManager filterManager = filterInitialisation(portletWindow,PortletRequest.RENDER_PHASE);
- invoker.render(servletContext, renderRequest, renderResponse, portletWindow, filterManager);
+ invoker.render(portletContext.getServletContext(), renderRequest, renderResponse, portletWindow, filterManager);
} finally {
ContainerInvocation.clearInvocation();
}
@@ -222,12 +226,15 @@
InternalResourceResponse resourceResponse = getOptionalContainerServices().getPortletEnvironmentService()
.createResourceResponse(this, request, response, portletWindow);
+ String appId = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getId();
+ InternalPortletContext portletContext = optionalContainerServices.getPortletRegistryService().getPortletContext(appId);
+
PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
try {
ContainerInvocation.setInvocation(this, portletWindow);
FilterManager filterManager = filterInitialisation(portletWindow,PortletRequest.RESOURCE_PHASE);
- invoker.serveResource(servletContext, resourceRequest, resourceResponse, portletWindow, filterManager);
+ invoker.serveResource(portletContext.getServletContext(), resourceRequest, resourceResponse, portletWindow, filterManager);
} finally {
ContainerInvocation.clearInvocation();
}
@@ -263,12 +270,15 @@
InternalActionResponse actionResponse = getOptionalContainerServices().getPortletEnvironmentService()
.createActionResponse(this, request, response, portletWindow);
+ String appId = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getId();
+ InternalPortletContext portletContext = optionalContainerServices.getPortletRegistryService().getPortletContext(appId);
+
PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
try {
ContainerInvocation.setInvocation(this, portletWindow);
FilterManager filterManager = filterInitialisation(portletWindow,PortletRequest.ACTION_PHASE);
- invoker.action(servletContext, actionRequest, actionResponse, portletWindow, filterManager);
+ invoker.action(portletContext.getServletContext(), actionRequest, actionResponse, portletWindow, filterManager);
}
finally {
ContainerInvocation.clearInvocation();
@@ -337,11 +347,14 @@
getOptionalContainerServices().getPortletEnvironmentService()
.createRenderResponse(this, request, response, portletWindow);
+ String appId = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getId();
+ InternalPortletContext portletContext = optionalContainerServices.getPortletRegistryService().getPortletContext(appId);
+
PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
try {
ContainerInvocation.setInvocation(this, portletWindow);
- invoker.load(servletContext, renderRequest, renderResponse, portletWindow);
+ invoker.load(portletContext.getServletContext(), renderRequest, renderResponse, portletWindow);
} finally {
ContainerInvocation.clearInvocation();
}
@@ -365,12 +378,14 @@
InternalPortletResponse internalResponse =
new AdminResponse(this, portletWindow, servletRequest, servletResponse);
- PortletInvokerService invoker =
- optionalContainerServices.getPortletInvokerService();
+ String appId = portletWindow.getPortletEntity().getPortletDefinition().getApplication().getId();
+ InternalPortletContext portletContext = optionalContainerServices.getPortletRegistryService().getPortletContext(appId);
+
+ PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
try {
ContainerInvocation.setInvocation(this, portletWindow);
- invoker.admin(servletContext, internalRequest, internalResponse, portletWindow);
+ invoker.admin(portletContext.getServletContext(), internalRequest, internalResponse, portletWindow);
} finally {
ContainerInvocation.clearInvocation();
}
@@ -469,12 +484,15 @@
this, window, request, response);
+ String appId = window.getPortletEntity().getPortletDefinition().getApplication().getId();
+ InternalPortletContext portletContext = optionalContainerServices.getPortletRegistryService().getPortletContext(appId);
+
PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
try {
ContainerInvocation.setInvocation(this, window);
FilterManager filterManager = filterInitialisation(window,PortletRequest.EVENT_PHASE);
- invoker.event(servletContext, eventRequest, eventResponse, window, filterManager);
+ invoker.event(portletContext.getServletContext(), eventRequest, eventResponse, window, filterManager);
}
finally {
ContainerInvocation.clearInvocation();