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 ra...@apache.org on 2003/11/30 17:33:18 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl PortletRendererImpl.java RenderingJob.java
raphael 2003/11/30 08:33:18
Modified: portal/src/java/org/apache/jetspeed/aggregator/impl Tag:
aggregation_1-branch PortletRendererImpl.java
RenderingJob.java
Added: portal/src/java/org/apache/jetspeed/aggregator Tag:
aggregation_1-branch PageAggregator.java
Log:
-Implement a simple PageAggregator for testing the aggregation engine
Revision Changes Path
No revision
No revision
1.1.2.1 +216 -0 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/Attic/PageAggregator.java
No revision
No revision
1.1.2.3 +16 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Attic/PortletRendererImpl.java
Index: PortletRendererImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Attic/PortletRendererImpl.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PortletRendererImpl.java 30 Nov 2003 15:30:33 -0000 1.1.2.2
+++ PortletRendererImpl.java 30 Nov 2003 16:33:17 -0000 1.1.2.3
@@ -127,6 +127,7 @@
//
// create the portlet window and render the portlet
//
+ HttpServletRequest servletRequest = null;
try
{
ObjectID oid = JetspeedObjectID.createFromString(fragment.getId());
@@ -134,9 +135,11 @@
PortletEntity portletEntity = PortletEntityAccess.getEntity(oid);
PortletWindow portletWindow = PortletWindowFactory.getWindow(portletEntity, oid);
- HttpServletRequest servletRequest = request.getRequestForWindow(portletWindow);
+ servletRequest = request.getRequestForWindow(portletWindow);
HttpServletResponse servletResponse = request.getResponseForWindow(portletWindow);
+ servletRequest.setAttribute("page.fragment",fragment);
+
container.renderPortlet(portletWindow, servletRequest, servletResponse);
}
catch (Throwable t)
@@ -144,6 +147,13 @@
t.printStackTrace();
log.error("Failed to service portlet, portlet exception: " + t);
}
+ finally
+ {
+ if (servletRequest!=null)
+ {
+ servletRequest.removeAttribute("page.fragment");
+ }
+ }
}
/** Render the specified Page fragment.
@@ -159,10 +169,13 @@
PortletWindow portletWindow = PortletWindowFactory.getWindow(portletEntity, oid);
ContentDispatcher dispatcher = getDispatcher(request);
+ HttpServletRequest servletRequest = request.getRequestForWindow(portletWindow);
HttpServletResponse servletResponse = dispatcher.register(portletWindow, request);
+ servletRequest.setAttribute("page.fragment",fragment);
+
rJob.setWindow(portletWindow);
- rJob.setRequest(request.getRequestForWindow(portletWindow));
+ rJob.setRequest(servletRequest);
rJob.setResponse(servletResponse);
rJob.setDispatcher(dispatcher);
1.1.2.2 +5 -1 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Attic/RenderingJob.java
Index: RenderingJob.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Attic/RenderingJob.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RenderingJob.java 29 Nov 2003 23:00:01 -0000 1.1.2.1
+++ RenderingJob.java 30 Nov 2003 16:33:17 -0000 1.1.2.2
@@ -155,5 +155,9 @@
t.printStackTrace();
log.error("Failed to service portlet, portlet exception: " + t);
}
+ finally
+ {
+ this.request.removeAttribute("page.fragment");
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org