You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by pa...@apache.org on 2002/06/28 05:51:26 UTC

cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages JetspeedTemplatePage.java

paulsp      2002/06/27 20:51:26

  Modified:    src/java/org/apache/jetspeed/modules/pages
                        JetspeedTemplatePage.java
  Log:
  Send HTTP header before any actions are executed.  Thanks to Konstantin for
  the patch.
  
  Revision  Changes    Path
  1.17      +28 -17    jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java
  
  Index: JetspeedTemplatePage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JetspeedTemplatePage.java	27 Oct 2001 04:31:19 -0000	1.16
  +++ JetspeedTemplatePage.java	28 Jun 2002 03:51:26 -0000	1.17
  @@ -141,25 +141,36 @@
        * @param data Turbine information.
        * @exception Exception, a generic exception.
        */
  -    protected void doBuildAfterAction(RunData data) throws Exception
  +    protected void doBuildBeforeAction(RunData data) throws Exception
       {
  -
  -        switch (httpLifetime) {
  -        case -1:
  -          break;
  -        case 0:
  -          data.getResponse().setHeader("Cache-Control", "no-cache");
  -          data.getResponse().setHeader("Pragma", "no-cache");
  -          data.getResponse().setDateHeader("Expires", 0);
  -          data.getResponse().setDateHeader("Last-Modified", System.currentTimeMillis());
  -          break;
  -        default:
  -          data.getResponse().setHeader("Cache-Control", "max-age=" + httpLifetime);
  -          data.getResponse().setDateHeader("Expires", System.currentTimeMillis() + (httpLifetime * 1000));
  -          data.getResponse().setDateHeader("Last-Modified", System.currentTimeMillis());
  -          break;
  +        switch (httpLifetime)
  +        {
  +            case -1:
  +                break;
  +            case 0:
  +                data.getResponse().setHeader("Cache-Control", "no-cache");
  +                data.getResponse().setHeader("Pragma", "no-cache");
  +                data.getResponse().setDateHeader("Expires", 0);
  +                data.getResponse().setDateHeader("Last-Modified", System.currentTimeMillis());
  +                break;
  +            default:
  +                data.getResponse().setHeader("Cache-Control", "max-age=" + httpLifetime);
  +                data.getResponse().setDateHeader("Expires", System.currentTimeMillis() + (httpLifetime * 1000));
  +                data.getResponse().setDateHeader("Last-Modified", System.currentTimeMillis());
  +                break;
           }
  +        
  +    }
   
  +    /**
  +     * Works with TemplateService to set up default templates and
  +     * corresponding class modules.
  +     *
  +     * @param data Turbine information.
  +     * @exception Exception, a generic exception.
  +     */
  +    protected void doBuildAfterAction(RunData data) throws Exception
  +    {
           // Either template or screen should be guaranteed by the SessionValidator
           // It is occasionally better to specify the screen instead of template
           // in cases where multiple Screens map to one template.  The template
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>