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 wo...@apache.org on 2009/03/31 11:42:34 UTC
svn commit: r760381 - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/
jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/
Author: woonsan
Date: Tue Mar 31 09:42:31 2009
New Revision: 760381
URL: http://svn.apache.org/viewvc?rev=760381&view=rev
Log:
Removes fragment parameter in the PortletRendererImpl's internal method invocations and RenderingJobImpl constructor
because the fragment can be retrieved by the portletWindow.
So, I think it is desirable to use portletWindow instead of passing another fragment parameter to prevent later possible problems.
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletRenderer.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java?rev=760381&r1=760380&r2=760381&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java Tue Mar 31 09:42:31 2009
@@ -196,8 +196,8 @@
}
if (portletTracking.isOutOfService(portletWindow))
{
- log.info("Taking portlet out of service: " + portletDefinition.getUniqueName() + " for window " + fragment.getId());
- fragment.overrideRenderedContent(OUT_OF_SERVICE_MESSAGE);
+ log.info("Taking portlet out of service: " + portletDefinition.getUniqueName() + " for window " + portletWindow.getId());
+ portletWindow.getFragment().overrideRenderedContent(OUT_OF_SERVICE_MESSAGE);
return;
}
long timeoutMetadata = this.getTimeoutOnJob(portletDefinition);
@@ -205,15 +205,15 @@
int expirationCache = getExpirationCache(portletDefinition);
if (expirationCache != 0)
{
- if (retrieveCachedContent(requestContext, fragment, portletWindow, expirationCache, portletDefinition))
+ if (retrieveCachedContent(requestContext, portletWindow, expirationCache, portletDefinition))
return;
contentIsCached = true;
}
- dispatcher = createDispatcher(requestContext, fragment, expirationCache);
+ dispatcher = createDispatcher(requestContext, portletWindow.getFragment(), expirationCache);
servletRequest = requestContext.getRequest();
servletResponse = requestContext.getResponse();
RenderingJob rJob =
- buildRenderingJob(portletWindow, fragment, servletRequest, servletResponse,
+ buildRenderingJob(portletWindow, servletRequest, servletResponse,
requestContext, spawned, portletDefinition, dispatcher, null,
expirationCache, contentIsCached, timeoutMetadata);
if (spawned)
@@ -227,7 +227,7 @@
{
rJob.execute();
}
- addTitleToHeader( portletWindow, fragment, servletRequest, servletResponse, dispatcher, contentIsCached);
+ addTitleToHeader( portletWindow, servletRequest, servletResponse, dispatcher, contentIsCached);
}
catch (PortletAccessDeniedException e)
{
@@ -324,14 +324,14 @@
if (expirationCache != 0)
{
portletTracking.setExpiration(portletWindow, expirationCache);
- contentIsCached = retrieveCachedContent(requestContext, fragment, portletWindow,
+ contentIsCached = retrieveCachedContent(requestContext, portletWindow,
expirationCache, portletDefinition);
if (contentIsCached)
{
return null;
}
}
- job = buildRenderingJob( portletWindow, fragment, requestContext, true,
+ job = buildRenderingJob( portletWindow, requestContext, true,
portletDefinition, null, contentIsCached, timeoutMetadata );
}
catch (Exception e)
@@ -356,8 +356,6 @@
protected void processRenderingJob(RenderingJob job, boolean parallelOnly)
{
- ContentFragment fragment = null;
-
try
{
if (parallelOnly || job.getTimeout() > 0)
@@ -367,7 +365,7 @@
else
{
job.execute();
- addTitleToHeader(job.getWindow(), job.getFragment(),
+ addTitleToHeader(job.getWindow(),
job.getRequest(), job.getResponse(), job.getDispatcher(),
job.isContentCached());
}
@@ -375,7 +373,7 @@
catch (Exception e1)
{
log.error("render() failed: " + e1.toString(), e1);
- fragment.overrideRenderedContent(e1.getLocalizedMessage());
+ job.getFragment().overrideRenderedContent(e1.getLocalizedMessage());
}
}
@@ -395,11 +393,12 @@
* @param portletWindow
* @return true when content found, otherwise false
*/
- protected boolean retrieveCachedContent(RequestContext requestContext, ContentFragment fragment,
+ protected boolean retrieveCachedContent(RequestContext requestContext,
PortletWindow portletWindow, int expiration,
PortletDefinition portletDefinition)
throws Exception
{
+ ContentFragment fragment = portletWindow.getFragment();
ContentCacheKey cacheKey = portletContentCache.createCacheKey(requestContext, fragment.getId());
CacheElement cachedElement = portletContentCache.get(cacheKey);
if (cachedElement != null)
@@ -444,24 +443,24 @@
}
- protected RenderingJob buildRenderingJob( PortletWindow portletWindow, ContentFragment fragment,
+ protected RenderingJob buildRenderingJob( PortletWindow portletWindow,
RequestContext requestContext, boolean isParallel,
PortletDefinition portletDefinition,
PortletContent portletContent, boolean contentIsCached, long timeoutMetadata)
throws PortletAccessDeniedException
{
int expirationCache = getExpirationCache(portletDefinition);
- ContentDispatcherCtrl dispatcher = createDispatcher(requestContext, fragment, expirationCache);
+ ContentDispatcherCtrl dispatcher = createDispatcher(requestContext, portletWindow.getFragment(), expirationCache);
HttpServletRequest request = requestContext.getRequest();
HttpServletResponse response = requestContext.getResponse();
- return buildRenderingJob( portletWindow, fragment, request, response,
+ return buildRenderingJob( portletWindow, request, response,
requestContext, isParallel,
portletDefinition, dispatcher,
portletContent, expirationCache, contentIsCached, timeoutMetadata );
}
- protected RenderingJob buildRenderingJob( PortletWindow portletWindow, ContentFragment fragment,
+ protected RenderingJob buildRenderingJob( PortletWindow portletWindow,
HttpServletRequest request, HttpServletResponse response,
RequestContext requestContext, boolean isParallel,
PortletDefinition portletDefinition,
@@ -473,11 +472,11 @@
if (portletContent == null)
{
- portletContent = dispatcher.getPortletContent(fragment);
- fragment.setPortletContent(portletContent);
+ portletContent = dispatcher.getPortletContent(portletWindow.getFragment());
+ portletWindow.getFragment().setPortletContent(portletContent);
}
- rJob = new RenderingJobImpl(container, this, portletDefinition, portletContent, fragment, dispatcher,
+ rJob = new RenderingJobImpl(container, this, portletDefinition, portletContent, dispatcher,
request, response, requestContext, portletWindow,
statistics, expirationCache, contentIsCached );
@@ -533,10 +532,12 @@
}
}
- public void addTitleToHeader( PortletWindow portletWindow, ContentFragment fragment,
+ public void addTitleToHeader( PortletWindow portletWindow,
HttpServletRequest request, HttpServletResponse response,
ContentDispatcherCtrl dispatcher, boolean isCacheTitle )
{
+ ContentFragment fragment = portletWindow.getFragment();
+
if (overrideTitles)
{
try
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java?rev=760381&r1=760380&r2=760381&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java Tue Mar 31 09:42:31 2009
@@ -62,7 +62,6 @@
protected PortletContainer container = null;
protected PortletRenderer renderer = null;
- protected ContentFragment fragment = null;
protected RequestContext requestContext = null;
protected PortletTrackingManager portletTracking = null;
@@ -85,7 +84,6 @@
PortletRenderer renderer,
PortletDefinition portletDefinition,
PortletContent portletContent,
- ContentFragment fragment,
ContentDispatcherCtrl dispatcher,
HttpServletRequest request,
HttpServletResponse response,
@@ -100,7 +98,6 @@
this.portletTracking = renderer.getPortletTrackingManager();
this.statistics = statistics;
this.portletDefinition = portletDefinition;
- this.fragment = fragment;
this.dispatcher = dispatcher;
this.request = request;
this.response = response;
@@ -152,7 +149,7 @@
}
// A little baby hack to make sure the worker thread has PortletContent to write too.
- fragment.setPortletContent(portletContent);
+ this.window.getFragment().setPortletContent(portletContent);
execute();
}
finally
@@ -164,7 +161,7 @@
parallel = false;
synchronized (portletContent)
{
- if (log.isDebugEnabled()) log.debug("Notifying completion of rendering job for fragment " + fragment.getId());
+ if (log.isDebugEnabled()) log.debug("Notifying completion of rendering job for portlet window " + this.window.getId());
portletContent.notifyAll();
}
}
@@ -180,7 +177,8 @@
public void execute()
{
long start = System.currentTimeMillis();
- PortletWindow curWindow = this.window;
+ ContentFragment fragment = this.window.getFragment();
+
try
{
if (log.isDebugEnabled()) log.debug("Rendering OID "+this.window.getId()+" "+ this.request +" "+this.response);
@@ -191,11 +189,11 @@
if (t instanceof UnavailableException)
{
// no need to dump a full stack trace to the log
- log.error("Error rendering portlet OID " + curWindow.getId() + ": " + t.toString());
+ log.error("Error rendering portlet OID " + this.window.getId() + ": " + t.toString());
}
else
{
- log.error("Error rendering portlet OID " + curWindow.getId(), t);
+ log.error("Error rendering portlet OID " + this.window.getId(), t);
}
fragment.overrideRenderedContent(t.getMessage());
}
@@ -205,7 +203,7 @@
{
if (parallel)
{
- this.renderer.addTitleToHeader(curWindow, fragment,
+ this.renderer.addTitleToHeader(this.window,
this.request, this.response,
this.dispatcher, this.contentIsCached);
}
@@ -222,12 +220,12 @@
if (exceededTimeout)
{
// took too long to render
- log.info("Portlet Exceeded timeout: " + curWindow.getPortletDefinition().getPortletName() + " for window " + curWindow.getId());
- portletTracking.incrementRenderTimeoutCount(curWindow);
+ log.info("Portlet Exceeded timeout: " + this.window.getPortletDefinition().getPortletName() + " for window " + this.window.getId());
+ portletTracking.incrementRenderTimeoutCount(this.window);
}
else
{
- portletTracking.success(curWindow);
+ portletTracking.success(this.window);
}
}
}
@@ -291,7 +289,7 @@
public ContentFragment getFragment()
{
- return this.fragment;
+ return this.window.getFragment();
}
public RequestContext getRequestContext()
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletRenderer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletRenderer.java?rev=760381&r1=760380&r2=760381&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletRenderer.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/aggregator/PortletRenderer.java Tue Mar 31 09:42:31 2009
@@ -118,13 +118,12 @@
* Set title of portlet window.
*
* @param portletWindow
- * @param fragment
* @param request
* @param response
* @param dispatcher
* @param isCacheTitle
*/
- public void addTitleToHeader( PortletWindow portletWindow, ContentFragment fragment,
+ public void addTitleToHeader( PortletWindow portletWindow,
HttpServletRequest request, HttpServletResponse response,
ContentDispatcherCtrl dispatcher, boolean isCacheTitle );
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org