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 Mon, 08 Dec 2003 20:48:55 GMT
raphael     2003/12/08 12:48:55

  Modified:    commons/src/java/org/apache/jetspeed/container Tag:
                        aggregation_1-branch JetspeedContainerServlet.java
  Log:
  remove phoney portlet decoratons, they aren't needed anymore :)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.1   +11 -11    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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- JetspeedContainerServlet.java	20 Oct 2003 03:44:32 -0000	1.2
  +++ JetspeedContainerServlet.java	8 Dec 2003 20:48:55 -0000	1.2.2.1
  @@ -141,22 +141,22 @@
                                       ServletHelper.findInitParameter(context, config,
                                                         JETSPEED_PROPERTIES_KEY,
                                                         JETSPEED_PROPERTIES_DEFAULT);
  -                                
  +
                                   String applicationRoot =
                                       ServletHelper.findInitParameter(context, config,
                                                     APPLICATION_ROOT_KEY,
                                                     APPLICATION_ROOT_DEFAULT);
                     */
                   webappRoot = config.getServletContext().getRealPath("/");
  -                /*                
  +                /*
                                   if (applicationRoot == null || applicationRoot.equals(WEB_CONTEXT))
                                   {
                                       applicationRoot = webappRoot;
                                   }
  -                                    
  -                                Configuration properties = (Configuration) 
  +
  +                                Configuration properties = (Configuration)
                                       new PropertiesConfiguration(ServletHelper.getRealPath(config,
propertiesFilename));
  -                                
  +
                                   properties.setProperty(APPLICATION_ROOT_KEY, applicationRoot);
                                   properties.setProperty(WEBAPP_ROOT_KEY, webappRoot);
                     */
  @@ -244,13 +244,13 @@
                   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);
  +//              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);
  +//              response.getWriter().print(PHONEY_PORTLET_WINDOW);
               }
   
           }
  @@ -289,6 +289,6 @@
           log.info("Done shutting down!");
       }
   
  -  
  +
   
   }
  
  
  

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