portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject cvs commit: jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/container JetspeedContainerServlet.java
Date Wed, 31 Dec 2003 08:46:26 GMT
raphael     2003/12/31 00:46:26

  Modified:    commons/src/java/org/apache/jetspeed/container Tag:
                        aggregation_1-branch JetspeedContainerServlet.java
  Log:
  - Create a new abstract LayoutPortlet to simplify defintiion of Layout portlets
  - Expand portlet definitions in Jetspeed portlet.xml
  - Misc bug fixes/debug comment changes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.2   +6 -12     jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
  
  Index: JetspeedContainerServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- JetspeedContainerServlet.java	8 Dec 2003 20:48:55 -0000	1.2.2.1
  +++ JetspeedContainerServlet.java	31 Dec 2003 08:46:26 -0000	1.2.2.2
  @@ -117,11 +117,11 @@
       /**
        * Intialize Servlet.
        */
  -    public final void init(ServletConfig config) throws ServletException
  +    public synchronized final void init(ServletConfig config) throws ServletException
       {
           synchronized (this.getClass())
           {
  -            log.info(INIT_START_MSG);
  +            log.info(INIT_START_MSG+" "+config.getServletContext().getRealPath("/"));
               super.init(config);
   
               if (!firstInit)
  @@ -170,7 +170,7 @@
               }
   
               console.info(INIT_DONE_MSG);
  -            log.info(INIT_DONE_MSG);
  +            log.info(INIT_DONE_MSG+" "+config.getServletContext().getRealPath("/"));
           }
       }
   
  @@ -180,7 +180,7 @@
        *
        * @param data The first <code>GET</code> request.
        */
  -    public final void init(HttpServletRequest request, HttpServletResponse response)
  +    public synchronized final void init(HttpServletRequest request, HttpServletResponse
response)
       {
           synchronized (JetspeedContainerServlet.class)
           {
  @@ -230,7 +230,7 @@
                   return;
               }
   
  -            //res.getWriter().print("Rendering: Portlet Class = " + entity.getPortletClass()
+ "<BR/>");
  +            log.debug("Rendering: Portlet Class = " + portletDefinition.getClassName());
   
               if (method == ContainerConstants.METHOD_ACTION)
               {
  @@ -244,13 +244,7 @@
                   RenderRequest renderRequest = (RenderRequest) request.getAttribute(ContainerConstants.PORTLET_REQUEST);
                   RenderResponse renderResponse = (RenderResponse) request.getAttribute(ContainerConstants.PORTLET_RESPONSE);
   
  -//              response.getWriter().print(PHONEY_PORTLET_WINDOW);
  -//              response.getWriter().print(portletDefinition.getName());
  -//              response.getWriter().print(PHONEY_PORTLET_WINDOW);
  -
                   portlet.render(renderRequest, renderResponse);
  -
  -//              response.getWriter().print(PHONEY_PORTLET_WINDOW);
               }
   
           }
  
  
  

---------------------------------------------------------------------
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