giacomo 01/05/05 14:34:44
Modified: src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPGenerator.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
AbstractServerPage.java
Added: src/org/apache/cocoon/caching Tag: xml-cocoon2
NOTCacheValidity.java
Log:
Make XSP pages not cachable per default. This way the "Manage Employee"
sample will work again. Without this only the first page will be shown
because it will be cached and never changed
Revision Changes Path
No revision
No revision
1.1.2.1 +26 -0
xml-cocoon/src/org/apache/cocoon/caching/Attic/NOTCacheValidity.java
No revision
No revision
1.1.2.23 +1 -10
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java
Index: XSPGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPGenerator.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- XSPGenerator.java 2001/05/04 15:06:42 1.1.2.22
+++ XSPGenerator.java 2001/05/05 21:34:44 1.1.2.23
@@ -13,8 +13,6 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.cocoon.Roles;
import org.apache.cocoon.components.language.generator.CompiledComponent;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.TimeStampCacheValidity;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.generation.AbstractServerPage;
import org.apache.avalon.excalibur.pool.Poolable;
@@ -23,7 +21,7 @@
* Base class for XSP-generated <code>ServerPagesGenerator</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/05/04 15:06:42 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/05/05 21:34:44 $
*/
public abstract class XSPGenerator extends AbstractServerPage implements
CompiledComponent, Contextualizable, Poolable {
@@ -39,12 +37,5 @@
*/
public void compose(ComponentManager manager) {
super.compose(manager);
- }
-
- /**
- * Generate the Validity of this type of serverpage.
- */
- public CacheValidity generateValidity() {
- return new TimeStampCacheValidity(this.dateCreated);
}
}
No revision
No revision
1.1.2.11 +8 -3
xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java
Index: AbstractServerPage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/AbstractServerPage.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AbstractServerPage.java 2001/05/04 15:06:52 1.1.2.10
+++ AbstractServerPage.java 2001/05/05 21:34:44 1.1.2.11
@@ -11,6 +11,7 @@
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.NOPCacheValidity;
+import org.apache.cocoon.caching.NOTCacheValidity;
import org.apache.cocoon.components.language.generator.CompiledComponent;
import org.apache.cocoon.environment.Request;
import org.xml.sax.SAXException;
@@ -21,7 +22,7 @@
* declares variables that must be explicitly initialized by code generators.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/05/04 15:06:52 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/05/05 21:34:44 $
*/
public abstract class AbstractServerPage
extends ServletGenerator implements CompiledComponent, Cacheable
@@ -95,10 +96,14 @@
* Generate the validity object.
*
* @return The generated validity object, <code>NOPCacheValidity</code>
- * is the default.
+ * is the default if hasContentChange() gives false otherwise
+ * <code>NOTCacheValidity</code> will be returned.
*/
public CacheValidity generateValidity() {
- return new NOPCacheValidity();
+ if (hasContentChanged(request))
+ return new NOTCacheValidity();
+ else
+ return new NOPCacheValidity();
}
// FIXME: Add more methods!
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
