weaver      2003/10/05 17:28:42

  Modified:    portal/src/java/org/apache/jetspeed/container
                        JetspeedPortletContainerWrapper.java
  Log:
  - changes due to new Pluto drop
  - the init() method has 2 new args
    - a string that is a unique container ID
    - A Properties object, the purpose of which is not immediately apparent
  
  Revision  Changes    Path
  1.3       +63 -55    
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java
  
  Index: JetspeedPortletContainerWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/JetspeedPortletContainerWrapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JetspeedPortletContainerWrapper.java      12 Aug 2003 05:15:24 -0000      1.2
  +++ JetspeedPortletContainerWrapper.java      6 Oct 2003 00:28:42 -0000       1.3
  @@ -54,6 +54,7 @@
   package org.apache.jetspeed.container;
   
   import java.io.IOException;
  +import java.util.Properties;
   
   import javax.servlet.ServletConfig;
   import javax.servlet.http.HttpServletRequest;
  @@ -72,64 +73,71 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
    * @version $Id$
    */
  -public class JetspeedPortletContainerWrapper 
  -    implements PortletContainer
  +public class JetspeedPortletContainerWrapper implements PortletContainer
   {
  +    private boolean initialiized = false;
   
  -    public void init(ServletConfig servletConfig,
  -                     PortletContainerEnvironment environment)
  -    throws PortletContainerException
  -    {        
  -        PortletContainerFactory.
  -            getPortletContainerOriginal().
  -                init(servletConfig, 
  -                     environment);
  -    }
  -
  -    public void destroy() throws PortletContainerException
  -    {
  -        PortletContainerFactory.
  -            getPortletContainerOriginal().
  -                destroy();
  +    public void init(
  +        String uniqueContainerId,
  +        ServletConfig servletConfig,
  +        PortletContainerEnvironment environment,
  +        Properties props)
  +        throws PortletContainerException
  +    {
  +
  +        
PortletContainerFactory.getPortletContainerOriginal().init(uniqueContainerId, 
servletConfig, environment, props);
  +        initialiized = true;
  +    }
  +
  +    public void shutdown() throws PortletContainerException
  +    {
  +        //        PortletContainerFactory.
  +        //            getPortletContainerOriginal().
  +        //                destroy();
  +        initialiized = false;
  +        PortletContainerFactory.getPortletContainerOriginal().shutdown();
       }
   
  +    public void renderPortlet(PortletWindow portletWindow, HttpServletRequest 
servletRequest, HttpServletResponse servletResponse)
  +        throws PortletException, IOException, PortletContainerException
  +    {
  +        
PortletContainerFactory.getPortletContainerOriginal().renderPortlet(portletWindow, 
servletRequest, servletResponse);
  +        // TODO: figure out how to access pluto-services before container kicks in
  +        //                              
ServletObjectAccess.getServletRequest(servletRequest), 
  +        //                              
ServletObjectAccess.getServletResponse(servletResponse));
  +    }
   
  -    public void renderPortlet ( PortletWindow portletWindow,
  -                                 HttpServletRequest servletRequest,
  -                                 HttpServletResponse servletResponse )
  -    throws PortletException, IOException, PortletContainerException
  -    {
  -        PortletContainerFactory.
  -            getPortletContainerOriginal().
  -                renderPortlet(portletWindow, servletRequest, servletResponse);
  -// TODO: figure out how to access pluto-services before container kicks in
  -//                              
ServletObjectAccess.getServletRequest(servletRequest), 
  -//                              
ServletObjectAccess.getServletResponse(servletResponse));
  -    }
  -
  -    public void processPortletAction( PortletWindow portletWindow,
  -                                      HttpServletRequest servletRequest,
  -                                      HttpServletResponse servletResponse )
  -    throws PortletException, IOException, PortletContainerException
  -    {
  -        PortletContainerFactory.
  -            getPortletContainerOriginal().
  -                processPortletAction(portletWindow,
  -                                     servletRequest, servletResponse);              
                        
  -//                                     
ServletObjectAccess.getServletRequest(servletRequest),
  -//                                     
ServletObjectAccess.getServletResponse(servletResponse));
  -    }
  -
  -    public void portletLoad ( PortletWindow portletWindow,
  -                              HttpServletRequest servletRequest,
  -                              HttpServletResponse servletResponse )
  -    throws PortletException, PortletContainerException
  -    {
  -        PortletContainerFactory.
  -            getPortletContainerOriginal().
  -                portletLoad(portletWindow,
  -                            ServletObjectAccess.getServletRequest(servletRequest),
  -                            
ServletObjectAccess.getServletResponse(servletResponse));
  +    public void processPortletAction(
  +        PortletWindow portletWindow,
  +        HttpServletRequest servletRequest,
  +        HttpServletResponse servletResponse)
  +        throws PortletException, IOException, PortletContainerException
  +    {
  +        
PortletContainerFactory.getPortletContainerOriginal().processPortletAction(portletWindow,
 servletRequest, servletResponse);
  +        //                                     
ServletObjectAccess.getServletRequest(servletRequest),
  +        //                                     
ServletObjectAccess.getServletResponse(servletResponse));
       }
  -    
  +
  +    public void portletLoad(PortletWindow portletWindow, HttpServletRequest 
servletRequest, HttpServletResponse servletResponse)
  +        throws PortletException, PortletContainerException
  +    {
  +        PortletContainerFactory.getPortletContainerOriginal().portletLoad(
  +            portletWindow,
  +            ServletObjectAccess.getServletRequest(servletRequest),
  +            ServletObjectAccess.getServletResponse(servletResponse));
  +    }
  +
  +    /** 
  +     * <p>
  +     * isInitialized
  +     * </p>
  +     * 
  +     * @see org.apache.pluto.PortletContainer#isInitialized()
  +     * @return
  +     */
  +    public boolean isInitialized()
  +    {
  +        return initialiized;
  +    }
  +
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to