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/src/java/org/apache/jetspeed/portal/portlets VelocityPortlet.java
Date Thu, 16 Aug 2001 15:08:54 GMT
raphael     01/08/16 08:08:54

  Modified:    src/java/org/apache/jetspeed/portal/controllers
                        VelocityPortletController.java
               src/java/org/apache/jetspeed/portal/controls
                        VelocityPortletControl.java
               src/java/org/apache/jetspeed/portal/portlets
                        VelocityPortlet.java
  Log:
  modify Velocity controls, controllers and portlets to use streaming
  Velocity in order to fix JSP inclusion issues
  
  Revision  Changes    Path
  1.5       +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPortletController.java
  
  Index: VelocityPortletController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPortletController.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VelocityPortletController.java	2001/07/11 09:36:46	1.4
  +++ VelocityPortletController.java	2001/08/16 15:08:54	1.5
  @@ -123,7 +123,7 @@
           String template = (String)context.get( "template" );
           
           // generate the content
  -        String s = null;
  +        String s = "";
   
           try
           {
  @@ -133,7 +133,7 @@
               }
               
               String templatePath = TemplateLocator.locateControllerTemplate(rundata, template);
  -            s = TurbineVelocity.handleRequest(context, templatePath);
  +            TurbineVelocity.handleRequest(context, templatePath, rundata.getOut());
           }
           catch( Exception e)
           {
  
  
  
  1.10      +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java
  
  Index: VelocityPortletControl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- VelocityPortletControl.java	2001/07/22 20:29:59	1.9
  +++ VelocityPortletControl.java	2001/08/16 15:08:54	1.10
  @@ -150,11 +150,11 @@
           
           String theme = getConfig().getInitParameter("theme","default.vm");
   
  -        String s = null;
  +        String s = "";
           try 
           {
               String template = TemplateLocator.locateControlTemplate(rundata,theme);
  -            s = TurbineVelocity.handleRequest(context, template);
  +            TurbineVelocity.handleRequest(context, template, rundata.getOut());
           }
           catch( Exception e )
           {
  
  
  
  1.7       +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/VelocityPortlet.java
  
  Index: VelocityPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/VelocityPortlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VelocityPortlet.java	2001/07/22 20:29:59	1.6
  +++ VelocityPortlet.java	2001/08/16 15:08:54	1.7
  @@ -138,14 +138,14 @@
           }
           
           // generate the content
  -        String s = null;
  +        String s = "";
   
           try
           {
               if (-1 == template.indexOf(".vm"))
                   template = template + ".vm";
               String templatePath = TemplateLocator.locatePortletTemplate(rundata, template);
  -            s = TurbineVelocity.handleRequest(context, templatePath);
  +            TurbineVelocity.handleRequest(context, templatePath, rundata.getOut());
           }
           catch( Exception e)
           {
  
  
  

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