sgala 2002/06/30 12:10:58
Modified: src/java/org/apache/jetspeed/modules/pages Tag:
jetspeed_13a3 JetspeedTemplatePage.java
Log:
bringing patch into the branch
Revision Changes Path
No revision
No revision
1.16.4.1 +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.16.4.1
diff -u -r1.16 -r1.16.4.1
--- JetspeedTemplatePage.java 27 Oct 2001 04:31:19 -0000 1.16
+++ JetspeedTemplatePage.java 30 Jun 2002 19:10:58 -0000 1.16.4.1
@@ -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: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
