weaver 2005/01/04 07:54:50
Modified: jetspeed-api/src/java/org/apache/jetspeed/aggregator
Aggregator.java PortletRenderer.java
ContentDispatcherCtrl.java ContentDispatcher.java
Added: jetspeed-api/src/java/org/apache/jetspeed/aggregator
UnrenderedContentException.java
Log:
see: http://issues.apache.org/jira/browse/JS2-183
Revision Changes Path
1.2 +4 -2
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/Aggregator.java
Index: Aggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/Aggregator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Aggregator.java 28 May 2004 18:51:55 -0000 1.1
+++ Aggregator.java 4 Jan 2005 15:54:50 -0000 1.2
@@ -15,6 +15,8 @@
*/
package org.apache.jetspeed.aggregator;
+import java.io.IOException;
+
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.request.RequestContext;
@@ -32,6 +34,6 @@
* @return Unique Portlet Entity ID
*/
public void build(RequestContext context)
- throws JetspeedException;
+ throws JetspeedException, IOException;
}
1.3 +9 -5
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletRenderer.java 28 Jul 2004 13:23:10 -0000 1.2
+++ PortletRenderer.java 4 Jan 2005 15:54:50 -0000 1.3
@@ -18,6 +18,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.jetspeed.container.window.FailedToRetrievePortletWindow;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.request.RequestContext;
@@ -27,7 +28,7 @@
* <p>This service process all portlet rendering requests and interfaces
with the portlet
* container to generate the resulting markup</p>
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta</a>
* @version $Id$
*/
public interface PortletRenderer
@@ -36,15 +37,17 @@
Render the specified Page fragment.
Result is returned in the PortletResponse.
* @throws FailedToRenderFragmentException
+ * @throws FailedToRetrievePortletWindow
*/
- public void renderNow(Fragment fragment, RequestContext request) throws
FailedToRenderFragmentException;
+ public void renderNow(Fragment fragment, RequestContext request) throws
FailedToRenderFragmentException, FailedToRetrievePortletWindow;
/**
Render the specified Page fragment.
Result is returned in the PortletResponse.
* @throws FailedToRenderFragmentException
+ * @throws FailedToRetrievePortletWindow
*/
- public void renderNow(Fragment fragment, HttpServletRequest request,
HttpServletResponse response) throws FailedToRenderFragmentException;
+ public void renderNow(Fragment fragment, HttpServletRequest request,
HttpServletResponse response) throws FailedToRenderFragmentException,
FailedToRetrievePortletWindow;
/**
*
@@ -52,8 +55,9 @@
* 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;
+ public void render(Fragment fragment, RequestContext request) throws
FailedToRenderFragmentException, FailedToRetrievePortletWindow;
/**
* Retrieve the ContentDispatcher for the specified request
1.2 +18 -2
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentDispatcherCtrl.java 28 May 2004 18:51:55 -0000 1.1
+++ ContentDispatcherCtrl.java 4 Jan 2005 15:54:50 -0000 1.2
@@ -17,6 +17,7 @@
import javax.servlet.http.HttpServletResponse;
+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;
@@ -25,7 +26,7 @@
* <p>The ContentDispatcher control interface used for updating the content
of
* a ContentDispatcher</p>
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta</a>
* @version $Id$
*/
public interface ContentDispatcherCtrl
@@ -40,4 +41,19 @@
* in order to be able to capture parallel rendering portlets
*/
public HttpServletResponse getResponseForWindow(PortletWindow window,
RequestContext request);
+
+ /**
+ *
+ * <p>
+ * getResponseForFragment
+ * </p>
+ * <p>
+ * Return the HttpServletResponse to use for a given Fragment
+ * in order to be able to capture parallel rendering portlets
+ * </p>
+ * @param fragment
+ * @param request
+ * @return
+ */
+ public HttpServletResponse getResponseForFragment( Fragment fragment,
RequestContext request );
}
1.3 +6 -19
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentDispatcher.java 28 Jul 2004 13:23:10 -0000 1.2
+++ ContentDispatcher.java 4 Jan 2005 15:54:50 -0000 1.3
@@ -15,38 +15,25 @@
*/
package org.apache.jetspeed.aggregator;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.jetspeed.om.page.Fragment;
/**
* <p>The ContentDispatcher allows customer classes to retrieved
* rendered content for a specific fragment</p>
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta</a>
* @version $Id$
*/
public interface ContentDispatcher
{
/**
- * Include in the provided PortletResponse output stream the rendered
content
- * of the request fragment.
- * If the fragment rendered content is not yet available, the method will
- * hold until it's completely rendered.
- * @throws FailedToRenderFragmentException if the Fragment to include
could not be rendered.
- */
- public void include(Fragment fragment, HttpServletRequest req,
HttpServletResponse rsp) throws FailedToRenderFragmentException;
-
- /**
- * Include in the provided PortletResponse output stream the rendered
content
- * of the request fragment.
+ * 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 FailedToRenderFragmentException if the Fragment to include
could not be rendered.
+ * @throws UnrenderedContentException
*/
- public void include(Fragment fragment, javax.portlet.RenderRequest req,
javax.portlet.RenderResponse rsp) throws FailedToRenderFragmentException;
-
+ public void include(Fragment fragment) throws UnrenderedContentException;
+
/**
* Sequentially wait on content generation for the given fragment.
*
1.1
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/aggregator/UnrenderedContentException.java
Index: UnrenderedContentException.java
===================================================================
/*
* Created on Dec 22, 2004
*
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.jetspeed.aggregator;
import org.apache.jetspeed.exception.JetspeedException;
/**
* <p>
* UnrenderedContentException
* </p>
* <p>
* This excpetion is raised when trying to access portlet content that did
not render correctly or not at all.
* </p>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
* @version $Id: UnrenderedContentException.java,v 1.1 2005/01/04 15:54:50
weaver Exp $
*
*/
public class UnrenderedContentException extends JetspeedException
{
/**
*
*/
public UnrenderedContentException()
{
super();
// TODO Auto-generated constructor stub
}
/**
* @param message
*/
public UnrenderedContentException( String message )
{
super(message);
// TODO Auto-generated constructor stub
}
/**
* @param nested
*/
public UnrenderedContentException( Throwable nested )
{
super(nested);
// TODO Auto-generated constructor stub
}
/**
* @param msg
* @param nested
*/
public UnrenderedContentException( String msg, Throwable nested )
{
super(msg, nested);
// TODO Auto-generated constructor stub
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
