weaver 2005/01/11 12:00:52
Modified: jetspeed-api/src/java/org/apache/jetspeed/aggregator
PortletRenderer.java ContentDispatcherCtrl.java
ContentDispatcher.java
Added: jetspeed-api/src/java/org/apache/jetspeed/aggregator
PortletContent.java
Log:
Moved ContentDispatcher functionallity into FragmentImpl and RenderingJob.
Split PortletContent into a top level interface and implementation.
Revision Changes Path
1.4 +4 -6
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletRenderer.java
Index: PortletRenderer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortletRenderer.java 4 Jan 2005 15:54:50 -0000 1.3
+++ PortletRenderer.java 11 Jan 2005 20:00:52 -0000 1.4
@@ -39,7 +39,7 @@
* @throws FailedToRenderFragmentException
* @throws FailedToRetrievePortletWindow
*/
- public void renderNow(Fragment fragment, RequestContext request) throws
FailedToRenderFragmentException, FailedToRetrievePortletWindow;
+ public void renderNow(Fragment fragment, RequestContext request) ;
/**
Render the specified Page fragment.
@@ -47,17 +47,15 @@
* @throws FailedToRenderFragmentException
* @throws FailedToRetrievePortletWindow
*/
- public void renderNow(Fragment fragment, HttpServletRequest request,
HttpServletResponse response) throws FailedToRenderFragmentException,
FailedToRetrievePortletWindow;
+ public void renderNow(Fragment fragment, HttpServletRequest request,
HttpServletResponse response) ;
/**
*
* Render the specified Page fragment.
* The method returns before rendering is complete, rendered content can
be
* accessed through the ContentDispatcher
- * @throws FailedToRenderFragmentException if the Fragment could not be
rendered.
- * @throws FailedToRetrievePortletWindow
*/
- public void render(Fragment fragment, RequestContext request) throws
FailedToRenderFragmentException, FailedToRetrievePortletWindow;
+ public void render(Fragment fragment, RequestContext request);
/**
* Retrieve the ContentDispatcher for the specified request
1.3 +2 -3
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/ContentDispatcherCtrl.java
Index: ContentDispatcherCtrl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/ContentDispatcherCtrl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentDispatcherCtrl.java 4 Jan 2005 15:54:50 -0000 1.2
+++ ContentDispatcherCtrl.java 11 Jan 2005 20:00:52 -0000 1.3
@@ -19,7 +19,6 @@
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.window.PortletWindow;
/**
@@ -34,7 +33,7 @@
/** Notify ContentDispatcher that the content for the specified OID is
* completely generated and is available for inclusion in other content
*/
- public void notify(ObjectID oid);
+// public void notify(ObjectID oid);
/**
* Return the HttpServletResponse to use for a given PortletWindow
1.4 +7 -11
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/ContentDispatcher.java
Index: ContentDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/ContentDispatcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentDispatcher.java 4 Jan 2005 15:54:50 -0000 1.3
+++ ContentDispatcher.java 11 Jan 2005 20:00:52 -0000 1.4
@@ -27,18 +27,14 @@
public interface ContentDispatcher
{
/**
- * Writes a portlets rendered content to the fragment.
- * If the fragment rendered content is not yet available, the method will
- * hold until it's completely rendered.
- * @throws UnrenderedContentException
- */
- public void include(Fragment fragment) throws UnrenderedContentException;
-
- /**
- * Sequentially wait on content generation for the given fragment.
*
+ * <p>
+ * getPortletContent
+ * </p>
+ *
* @param fragment
+ * @return
*/
- public void sync(Fragment fragment);
+ PortletContent getPortletContent(Fragment fragment);
}
1.1
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java
Index: PortletContent.java
===================================================================
/*
* Created on Jan 11, 2005
*
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.jetspeed.aggregator;
/**
* <p>
* PortletContent
* </p>
* <p>
*
* </p>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
* @version $Id: PortletContent.java,v 1.1 2005/01/11 20:00:52 weaver Exp $
*
*/
public interface PortletContent
{
String getContent();
boolean isComplete();
void complete();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
