weaver 2005/04/29 07:01:38
Modified: portal/src/java/org/apache/jetspeed/aggregator/impl
RenderingJob.java PortletAggregatorImpl.java
BasicAggregator.java PortletRendererImpl.java
PageAggregatorImpl.java
Log:
See JS2-252: http://issues.apache.org/jira/browse/JS2-252
Revision Changes Path
1.10 +4 -5
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJob.java
Index: RenderingJob.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJob.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RenderingJob.java 23 Mar 2005 22:46:45 -0000 1.9
+++ RenderingJob.java 29 Apr 2005 14:01:38 -0000 1.10
@@ -16,7 +16,6 @@
package org.apache.jetspeed.aggregator.impl;
-import javax.portlet.PortletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -24,7 +23,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.PortletContent;
-import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.om.window.PortletWindow;
@@ -48,12 +47,12 @@
private HttpServletResponse response = null;
private PortletContainer container = null;
- private Fragment fragment = null;
+ private ContentFragment fragment = null;
private RequestContext requestContext = null;
private PortletContent portletContent;
- public RenderingJob(PortletContainer container, PortletContent
portletContent, Fragment fragment, HttpServletRequest request,
HttpServletResponse response, RequestContext requestContext, PortletWindow
window)
+ public RenderingJob(PortletContainer container, PortletContent
portletContent, ContentFragment fragment, HttpServletRequest request,
HttpServletResponse response, RequestContext requestContext, PortletWindow
window)
{
this.container = container;
1.10 +5 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
Index: PortletAggregatorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PortletAggregatorImpl.java 11 Jan 2005 20:02:00 -0000 1.9
+++ PortletAggregatorImpl.java 29 Apr 2005 14:01:38 -0000 1.10
@@ -16,6 +16,7 @@
package org.apache.jetspeed.aggregator.impl;
import java.io.IOException;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
@@ -26,7 +27,9 @@
import org.apache.jetspeed.aggregator.PortletAggregator;
import org.apache.jetspeed.aggregator.PortletRenderer;
import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.psml.ContentFragmentImpl;
import org.apache.jetspeed.om.page.psml.FragmentImpl;
import org.apache.jetspeed.request.RequestContext;
@@ -54,7 +57,7 @@
*/
public void build(RequestContext context) throws JetspeedException,
IOException
{
- Fragment fragment = new FragmentImpl(); // TODO: fragment factory
+ ContentFragment fragment = new ContentFragmentImpl(new
FragmentImpl(), new HashMap()); // TODO: fragment factory
fragment.setType(Fragment.PORTLET);
fragment.setName(context.getRequestParameter(PortalReservedParameters.PORTLET));
String entity =
context.getRequestParameter(PortalReservedParameters.PORTLET_ENTITY);
1.8 +8 -8
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/BasicAggregator.java
Index: BasicAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/BasicAggregator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicAggregator.java 29 Oct 2004 14:18:04 -0000 1.7
+++ BasicAggregator.java 29 Apr 2005 14:01:38 -0000 1.8
@@ -26,8 +26,8 @@
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.om.portlet.PortletDefinition;
@@ -85,20 +85,20 @@
*/
public void build(RequestContext request) throws JetspeedException
{
- Page page = request.getPage();
+ ContentPage page = request.getPage();
if (null == page)
{
throw new JetspeedException("Failed to find PSML Pin
BasicAggregator.build");
}
- Fragment root = page.getRootFragment();
+ ContentFragment root = page.getRootContentFragment();
render(portletContainer, root, request);
for (Iterator fit = root.getFragments().iterator(); fit.hasNext();)
{
- Fragment fragment = (Fragment)fit.next();
+ ContentFragment fragment = (ContentFragment)fit.next();
- if (fragment.getType().equals(Fragment.LAYOUT))
+ if (fragment.getType().equals(ContentFragment.LAYOUT))
{
// skip layouts for now
// continue;
@@ -114,7 +114,7 @@
* @param fragment
* @param request
*/
- private void render(PortletContainer container, Fragment fragment,
RequestContext request)
+ private void render(PortletContainer container, ContentFragment
fragment, RequestContext request)
{
//
1.28 +7 -7
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
Index: PortletRendererImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- PortletRendererImpl.java 12 Jan 2005 17:20:53 -0000 1.27
+++ PortletRendererImpl.java 29 Apr 2005 14:01:38 -0000 1.28
@@ -29,7 +29,7 @@
import org.apache.jetspeed.aggregator.UnknownPortletDefinitionException;
import org.apache.jetspeed.container.window.FailedToRetrievePortletWindow;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
-import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.util.JetspeedObjectID;
import org.apache.pluto.PortletContainer;
@@ -82,7 +82,7 @@
* @throws FailedToRenderFragmentException
* @throws FailedToRetrievePortletWindow
*/
- public void renderNow( Fragment fragment, RequestContext requestContext )
+ public void renderNow( ContentFragment fragment, RequestContext
requestContext )
{
HttpServletRequest servletRequest = null;
@@ -117,7 +117,7 @@
* @throws FailedToRenderFragmentException
* @throws FailedToRetrievePortletWindow
*/
- public void renderNow( Fragment fragment, HttpServletRequest request,
HttpServletResponse response )
+ public void renderNow( ContentFragment fragment, HttpServletRequest
request, HttpServletResponse response )
{
RequestContext requestContext = (RequestContext) request
@@ -153,7 +153,7 @@
* @throws UnknownPortletDefinitionException
* @throws FailedToRetrievePortletWindow
*/
- public void render( Fragment fragment, RequestContext requestContext )
+ public void render( ContentFragment fragment, RequestContext
requestContext )
{
PortletContainerServices.prepare("jetspeed");
@@ -207,7 +207,7 @@
return (ContentDispatcherCtrl) request.getContentDispatcher();
}
- protected PortletWindow getPortletWindow( Fragment fragment ) throws
FailedToRetrievePortletWindow
+ protected PortletWindow getPortletWindow( ContentFragment fragment )
throws FailedToRetrievePortletWindow
{
ObjectID oid =
JetspeedObjectID.createFromString(fragment.getId());
@@ -224,7 +224,7 @@
}
- protected RenderingJob buildRenderingJob( Fragment fragment,
HttpServletRequest request,
+ protected RenderingJob buildRenderingJob( ContentFragment fragment,
HttpServletRequest request,
HttpServletResponse response, RequestContext requestContext )
throws FailedToRetrievePortletWindow,
FailedToRenderFragmentException
{
1.20 +38 -38
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java
Index: PageAggregatorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PageAggregatorImpl.java 11 Jan 2005 20:02:00 -0000 1.19
+++ PageAggregatorImpl.java 29 Apr 2005 14:01:38 -0000 1.20
@@ -32,13 +32,13 @@
import org.apache.jetspeed.container.state.NavigationalState;
import org.apache.jetspeed.contentserver.ContentFilter;
import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.om.page.ContentFragment;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.om.window.PortletWindow;
/**
- * PageAggregator builds the content required to render a page of portlets.
+ * ContentPageAggregator builds the content required to render a page of
portlets.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta </a>
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor </a>
@@ -75,17 +75,17 @@
*/
public void build( RequestContext context ) throws JetspeedException,
IOException
{
- Page page = context.getPage();
+ ContentPage page = context.getPage();
if (null == page)
{
- throw new JetspeedException("Failed to find PSML Pin
PageAggregator.build");
+ throw new JetspeedException("Failed to find PSML Pin
ContentPageAggregator.build");
}
- Fragment root = page.getRootFragment();
+ ContentFragment root = page.getRootContentFragment();
if (root == null)
{
- throw new JetspeedException("No root Fragment found in Page");
+ throw new JetspeedException("No root ContentFragment found in
ContentPage");
}
String layoutDecorator = root.getDecorator();
@@ -94,7 +94,7 @@
layoutDecorator = page.getDefaultDecorator(root.getType());
}
- String defaultPortletDecorator =
page.getDefaultDecorator(Fragment.PORTLET);
+ String defaultPortletDecorator =
page.getDefaultDecorator(ContentFragment.PORTLET);
///////////////////////////////////////////////////////////////////////////////////////////////
//TODO: Remove hard coding of locations and use CM + TL
@@ -131,7 +131,7 @@
if (layoutDecorator != null)
{
- addStyle(context, layoutDecorator, Fragment.LAYOUT);
+ addStyle(context, layoutDecorator, ContentFragment.LAYOUT);
}
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -165,44 +165,44 @@
*
* @param context
* @param page
- * @param layoutFragment
+ * @param layoutContentFragment
* @param defaultPortletDecorator
* @param dispatcher
* @param window
- * @throws FailedToRenderFragmentException
+ * @throws FailedToRenderContentFragmentException
*/
- protected void renderMaximizedWindow( RequestContext context, Page page,
Fragment layoutFragment,
+ protected void renderMaximizedWindow( RequestContext context,
ContentPage page, ContentFragment layoutContentFragment,
PortletWindow window ) throws FailedToRenderFragmentException
{
- String defaultPortletDecorator =
page.getDefaultDecorator(Fragment.PORTLET);
- Fragment maxedFragment =
page.getFragmentById(window.getId().toString());
- if (maxedFragment != null)
- {
-
context.getRequest().setAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE,
maxedFragment);
-
context.getRequest().setAttribute(PortalReservedParameters.FRAGMENT_ATTRIBUTE,
maxedFragment);
-
context.getRequest().setAttribute(PortalReservedParameters.MAXIMIZED_LAYOUT_ATTRIBUTE,
page.getRootFragment());
+ String defaultPortletDecorator =
page.getDefaultDecorator(ContentFragment.PORTLET);
+ ContentFragment maxedContentFragment =
page.getContentFragmentById(window.getId().toString());
+ if (maxedContentFragment != null)
+ {
+
context.getRequest().setAttribute(PortalReservedParameters.MAXIMIZED_FRAGMENT_ATTRIBUTE,
maxedContentFragment);
+
context.getRequest().setAttribute(PortalReservedParameters.FRAGMENT_ATTRIBUTE,
maxedContentFragment);
+
context.getRequest().setAttribute(PortalReservedParameters.MAXIMIZED_LAYOUT_ATTRIBUTE,
page.getRootContentFragment());
- if (maxedFragment.getDecorator() != null)
+ if (maxedContentFragment.getDecorator() != null)
{
- log.debug("decorator=" + layoutFragment.getDecorator());
- addStyle(context, maxedFragment.getDecorator(),
Fragment.PORTLET);
+ log.debug("decorator=" +
layoutContentFragment.getDecorator());
+ addStyle(context, maxedContentFragment.getDecorator(),
ContentFragment.PORTLET);
}
else
{
- log.debug("no decorator for defined for portlet fragement,"
+ layoutFragment.getId()
+ log.debug("no decorator for defined for portlet fragement,"
+ layoutContentFragment.getId()
+ ". So using page default, " +
defaultPortletDecorator);
- addStyle(context, defaultPortletDecorator, Fragment.PORTLET);
+ addStyle(context, defaultPortletDecorator,
ContentFragment.PORTLET);
}
try
{
- renderer.renderNow(maxedFragment, context);
- renderer.renderNow(layoutFragment, context);
+ renderer.renderNow(maxedContentFragment, context);
+ renderer.renderNow(layoutContentFragment, context);
}
catch (Exception e)
{
log.error(e.getMessage(), e);
- maxedFragment.overrideRenderedContent("Sorry, but we were
unable access the requested portlet. Send the following message to your portal
admin: "+ e.getMessage());
+ maxedContentFragment.overrideRenderedContent("Sorry, but we
were unable access the requested portlet. Send the following message to your
portal admin: "+ e.getMessage());
}
@@ -219,7 +219,7 @@
context.setAttribute("cssUrls", cssUrls);
}
- if (decoratorType.equals(Fragment.LAYOUT))
+ if (decoratorType.equals(ContentFragment.LAYOUT))
{
cssUrls.add("content/css/styles.css");
}
@@ -229,16 +229,16 @@
}
}
- protected void aggregateAndRender( Fragment f, RequestContext context,
Page page )
+ protected void aggregateAndRender( ContentFragment f, RequestContext
context, ContentPage page )
throws FailedToRenderFragmentException
{
- if (f.getFragments() != null && f.getFragments().size() > 0)
+ if (f.getContentFragments() != null &&
f.getContentFragments().size() > 0)
{
- Iterator children = f.getFragments().iterator();
+ Iterator children = f.getContentFragments().iterator();
while (children.hasNext())
{
- Fragment child = (Fragment) children.next();
+ ContentFragment child = (ContentFragment) children.next();
if (!"hidden".equals(f.getState()))
{
aggregateAndRender(child, context, page);
@@ -247,7 +247,7 @@
}
// Start the actual rendering process
- String defaultPortletDecorator =
page.getDefaultDecorator(Fragment.PORTLET);
+ String defaultPortletDecorator =
page.getDefaultDecorator(ContentFragment.PORTLET);
if (log.isDebugEnabled())
{
log.debug("Rendering portlet fragment: [[name, " + f.getName() +
"], [id, " + f.getId() + "]]");
@@ -265,16 +265,16 @@
renderer.render(f, context);
}
- if (f.getDecorator() != null && f.getType().equals(Fragment.PORTLET))
+ if (f.getDecorator() != null &&
f.getType().equals(ContentFragment.PORTLET))
{
log.debug("decorator=" + f.getDecorator());
- addStyle(context, f.getDecorator(), Fragment.PORTLET);
+ addStyle(context, f.getDecorator(), ContentFragment.PORTLET);
}
- else if (f.getDecorator() == null &&
f.getType().equals(Fragment.PORTLET))
+ else if (f.getDecorator() == null &&
f.getType().equals(ContentFragment.PORTLET))
{
log.debug("no decorator for defined for portlet fragement," +
f.getId() + ". So using page default, "
+ defaultPortletDecorator);
- addStyle(context, defaultPortletDecorator, Fragment.PORTLET);
+ addStyle(context, defaultPortletDecorator,
ContentFragment.PORTLET);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
