portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout columns.jsp
Date Thu, 08 Jan 2004 04:09:20 GMT
taylor      2004/01/07 20:09:20

  Modified:    portal/src/java/org/apache/jetspeed/aggregator
                        ContentDispatcher.java
               portal/src/java/org/apache/jetspeed/container/invoker
                        PortletInvokerFactoryImpl.java
               portal/src/webapp/WEB-INF/layout columns.jsp
  Log:
  completed merge of multithreaded page aggregator, fixing a few last bugs
  give it a try, we now have portlet windows and asynchonous portlet generation
  
  Revision  Changes    Path
  1.3       +10 -1     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/ContentDispatcher.java
  
  Index: ContentDispatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/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	31 Dec 2003 09:46:35 -0000	1.2
  +++ ContentDispatcher.java	8 Jan 2004 04:09:20 -0000	1.3
  @@ -78,4 +78,13 @@
        * hold until it's completely rendered.
        */
       public void include(Fragment fragment, HttpServletRequest req, HttpServletResponse
rsp);
  +    
  +    /**
  +     * 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.
  +     */
  +    public void include(Fragment fragment, javax.portlet.RenderRequest req, javax.portlet.RenderResponse
rsp);
  +    
   }
  
  
  
  1.6       +1 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java
  
  Index: PortletInvokerFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PortletInvokerFactoryImpl.java	8 Jan 2004 03:14:12 -0000	1.5
  +++ PortletInvokerFactoryImpl.java	8 Jan 2004 04:09:20 -0000	1.6
  @@ -99,7 +99,6 @@
   {
       private final static Log log = LogFactory.getLog(PortletInvokerFactoryImpl.class);
   
  -
       /** The servlet configuration for the Jetspeed portal */
       private ServletConfig servletConfig;
       
  
  
  
  1.3       +3 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/columns.jsp
  
  Index: columns.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/layout/columns.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- columns.jsp	31 Dec 2003 09:46:36 -0000	1.2
  +++ columns.jsp	8 Jan 2004 04:09:20 -0000	1.3
  @@ -6,8 +6,10 @@
   <portlet:defineObjects/>
   
   <% 
  +
   List[] table = (List[])renderRequest.getAttribute("columns");
   Page myPage = (Page)renderRequest.getAttribute("page");
  +
   Fragment myFragment = (Fragment)renderRequest.getAttribute("fragment");
   ContentDispatcher dispatcher = (ContentDispatcher)renderRequest.getAttribute("dispatcher");
 
   org.apache.pluto.om.entity.PortletEntity portletEntity = 
  @@ -86,7 +88,7 @@
              out.flush();
              if (!"hidden".equals(f.getState()))
              {
  -                dispatcher.include(f,(javax.portlet.RenderRequest)renderRequest,renderResponse);
  +                dispatcher.include(f,(javax.portlet.RenderRequest)renderRequest, (javax.portlet.RenderResponse)renderResponse);
              }
         %>
        <%
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message